diff options
| author | andresantoso@chromium.org <andresantoso@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-15 00:42:23 +0000 |
|---|---|---|
| committer | andresantoso@chromium.org <andresantoso@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-15 00:42:23 +0000 |
| commit | 0a37a5d254ce40eb5a16e886a53f907877b0ca49 (patch) | |
| tree | 368fec48373e40c4dd98f672b82a6b8f49796ea8 /ui/message_center | |
| parent | 0bd3c7cec1fa9c3599838d402e71987d55dd4c1a (diff) | |
| download | chromium_src-0a37a5d254ce40eb5a16e886a53f907877b0ca49.zip chromium_src-0a37a5d254ce40eb5a16e886a53f907877b0ca49.tar.gz chromium_src-0a37a5d254ce40eb5a16e886a53f907877b0ca49.tar.bz2 | |
MacViews: Move menu run types parameter to constructor.
This is in preparation for supporting running native Cocoa context menus to
support Services (https://codereview.chromium.org/331993009/).
The parameter is moved to the constructor so that we can know which kind of
MenuRunnerImpl to create at construction time.
TBR=sky@chromium.org
BUG=388455
Review URL: https://codereview.chromium.org/390183002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283114 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/message_center')
| -rw-r--r-- | ui/message_center/views/message_view_context_menu_controller.cc | 6 | ||||
| -rw-r--r-- | ui/message_center/views/notifier_settings_view.cc | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/ui/message_center/views/message_view_context_menu_controller.cc b/ui/message_center/views/message_view_context_menu_controller.cc index 3edaa29..d5b6139 100644 --- a/ui/message_center/views/message_view_context_menu_controller.cc +++ b/ui/message_center/views/message_view_context_menu_controller.cc @@ -32,14 +32,14 @@ void MessageViewContextMenuController::ShowContextMenuForView( if (!menu_model || menu_model->GetItemCount() == 0) return; - views::MenuRunner menu_runner(menu_model.get()); + views::MenuRunner menu_runner(menu_model.get(), + views::MenuRunner::HAS_MNEMONICS); ignore_result(menu_runner.RunMenuAt(source->GetWidget()->GetTopLevelWidget(), NULL, gfx::Rect(point, gfx::Size()), views::MENU_ANCHOR_TOPRIGHT, - source_type, - views::MenuRunner::HAS_MNEMONICS)); + source_type)); } } // namespace message_center diff --git a/ui/message_center/views/notifier_settings_view.cc b/ui/message_center/views/notifier_settings_view.cc index 4b12ede..80cb402 100644 --- a/ui/message_center/views/notifier_settings_view.cc +++ b/ui/message_center/views/notifier_settings_view.cc @@ -686,8 +686,8 @@ void NotifierSettingsView::ButtonPressed(views::Button* sender, void NotifierSettingsView::OnMenuButtonClicked(views::View* source, const gfx::Point& point) { notifier_group_menu_model_.reset(new NotifierGroupMenuModel(provider_)); - notifier_group_menu_runner_.reset( - new views::MenuRunner(notifier_group_menu_model_.get())); + notifier_group_menu_runner_.reset(new views::MenuRunner( + notifier_group_menu_model_.get(), views::MenuRunner::CONTEXT_MENU)); gfx::Rect menu_anchor = source->GetBoundsInScreen(); menu_anchor.Inset( gfx::Insets(0, kMenuWhitespaceOffset, 0, kMenuWhitespaceOffset)); @@ -696,8 +696,7 @@ void NotifierSettingsView::OnMenuButtonClicked(views::View* source, notifier_group_selector_, menu_anchor, views::MENU_ANCHOR_BUBBLE_ABOVE, - ui::MENU_SOURCE_MOUSE, - views::MenuRunner::CONTEXT_MENU)) + ui::MENU_SOURCE_MOUSE)) return; MessageCenterView* center_view = static_cast<MessageCenterView*>(parent()); center_view->OnSettingsChanged(); |