Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3963)

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_button.cc

Issue 331993009: MacViews: Run native Cocoa context menus to support Services. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add VIEWS_EXPORT for unit test access Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/toolbar/toolbar_button.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.cc b/chrome/browser/ui/views/toolbar/toolbar_button.cc
index 283e4c6720251e01615c6bb73ca1c981436d806f..ef2743a9f38cd529841ee9781a0578b29f7b0a80 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc
@@ -213,27 +213,27 @@ void ToolbarButton::ShowDropDownMenu(ui::MenuSourceType source_type) {
if (model_.get()) {
views::MenuModelAdapter menu_delegate(model_.get());
menu_delegate.set_triggerable_event_flags(triggerable_event_flags());
- menu_runner_.reset(new views::MenuRunner(menu_delegate.CreateMenu()));
+ menu_runner_.reset(new views::MenuRunner(menu_delegate.CreateMenu(),
+ views::MenuRunner::HAS_MNEMONICS));
views::MenuRunner::RunResult result =
menu_runner_->RunMenuAt(GetWidget(),
NULL,
gfx::Rect(menu_position, gfx::Size(0, 0)),
views::MENU_ANCHOR_TOPLEFT,
- source_type,
- views::MenuRunner::HAS_MNEMONICS);
+ source_type);
if (result == views::MenuRunner::MENU_DELETED)
return;
} else {
views::MenuDelegate menu_delegate;
views::MenuItemView* menu = new views::MenuItemView(&menu_delegate);
- menu_runner_.reset(new views::MenuRunner(menu));
+ menu_runner_.reset(
+ new views::MenuRunner(menu, views::MenuRunner::HAS_MNEMONICS));
views::MenuRunner::RunResult result =
menu_runner_->RunMenuAt(GetWidget(),
NULL,
gfx::Rect(menu_position, gfx::Size(0, 0)),
views::MENU_ANCHOR_TOPLEFT,
- source_type,
- views::MenuRunner::HAS_MNEMONICS);
+ source_type);
if (result == views::MenuRunner::MENU_DELETED)
return;
}

Powered by Google App Engine
This is Rietveld 408576698