diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-17 13:57:45 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-19 13:44:40 +0000 |
| commit | 6ec7b8da05d21a3878bd21c691b41e675d74bb1c (patch) | |
| tree | b87f250bc19413750b9bb9cdbf2da20ef5014820 /chromium/components/renderer_context_menu | |
| parent | ec02ee4181c49b61fce1c8fb99292dbb8139cc90 (diff) | |
| download | qtwebengine-chromium-6ec7b8da05d21a3878bd21c691b41e675d74bb1c.tar.gz | |
BASELINE: Update Chromium to 60.0.3112.70
Change-Id: I9911c2280a014d4632f254857876a395d4baed2d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/components/renderer_context_menu')
| -rw-r--r-- | chromium/components/renderer_context_menu/context_menu_delegate.cc | 6 | ||||
| -rw-r--r-- | chromium/components/renderer_context_menu/views/toolkit_delegate_views.cc | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/chromium/components/renderer_context_menu/context_menu_delegate.cc b/chromium/components/renderer_context_menu/context_menu_delegate.cc index e9fbd97e488..07f74f2358d 100644 --- a/chromium/components/renderer_context_menu/context_menu_delegate.cc +++ b/chromium/components/renderer_context_menu/context_menu_delegate.cc @@ -4,6 +4,7 @@ #include "components/renderer_context_menu/context_menu_delegate.h" +#include "base/memory/ptr_util.h" #include "content/public/browser/web_contents.h" namespace { @@ -24,8 +25,9 @@ class ContextMenuDelegateUserData : public base::SupportsUserData::Data { } // namespace ContextMenuDelegate::ContextMenuDelegate(content::WebContents* web_contents) { - web_contents->SetUserData(&kMenuDelegateUserDataKey, - new ContextMenuDelegateUserData(this)); + web_contents->SetUserData( + &kMenuDelegateUserDataKey, + base::MakeUnique<ContextMenuDelegateUserData>(this)); } ContextMenuDelegate::~ContextMenuDelegate() { diff --git a/chromium/components/renderer_context_menu/views/toolkit_delegate_views.cc b/chromium/components/renderer_context_menu/views/toolkit_delegate_views.cc index 81dfe55f560..1e5357c08de 100644 --- a/chromium/components/renderer_context_menu/views/toolkit_delegate_views.cc +++ b/chromium/components/renderer_context_menu/views/toolkit_delegate_views.cc @@ -22,17 +22,16 @@ void ToolkitDelegateViews::RunMenuAt(views::Widget* parent, type == ui::MENU_SOURCE_TOUCH_EDIT_MENU) ? views::MENU_ANCHOR_BOTTOMCENTER : views::MENU_ANCHOR_TOPLEFT; - ignore_result(menu_runner_->RunMenuAt( - parent, NULL, gfx::Rect(point, gfx::Size()), anchor_position, type)); + menu_runner_->RunMenuAt(parent, NULL, gfx::Rect(point, gfx::Size()), + anchor_position, type); } void ToolkitDelegateViews::Init(ui::SimpleMenuModel* menu_model) { menu_adapter_.reset(new views::MenuModelAdapter(menu_model)); menu_view_ = menu_adapter_->CreateMenu(); - menu_runner_.reset( - new views::MenuRunner(menu_view_, views::MenuRunner::HAS_MNEMONICS | - views::MenuRunner::CONTEXT_MENU | - views::MenuRunner::ASYNC)); + menu_runner_.reset(new views::MenuRunner( + menu_view_, + views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU)); } void ToolkitDelegateViews::Cancel() { |