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

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_context_menu.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/bookmarks/bookmark_context_menu.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.cc
index dd2dfc4beb114fcda5a108a0d2724a1204c527c8..9890077ad190d49214cb786f719cd252a9f97cc7 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.cc
@@ -45,10 +45,12 @@ BookmarkContextMenu::BookmarkContextMenu(
browser, profile, page_navigator, parent, selection)),
parent_widget_(parent_widget),
menu_(new views::MenuItemView(this)),
- menu_runner_(new views::MenuRunner(menu_)),
+ menu_runner_(new views::MenuRunner(menu_,
+ views::MenuRunner::HAS_MNEMONICS |
+ views::MenuRunner::IS_NESTED |
+ views::MenuRunner::CONTEXT_MENU)),
observer_(NULL),
close_on_remove_(close_on_remove) {
-
ui::SimpleMenuModel* menu_model = controller_->menu_model();
for (int i = 0; i < menu_model->GetItemCount(); ++i) {
views::MenuModelAdapter::AppendMenuItemFromModel(
@@ -66,15 +68,11 @@ void BookmarkContextMenu::RunMenuAt(const gfx::Point& point,
content::Source<BookmarkContextMenu>(this),
content::NotificationService::NoDetails());
// width/height don't matter here.
- if (menu_runner_->RunMenuAt(
- parent_widget_,
- NULL,
- gfx::Rect(point.x(), point.y(), 0, 0),
- views::MENU_ANCHOR_TOPLEFT,
- source_type,
- (views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::IS_NESTED |
- views::MenuRunner::CONTEXT_MENU)) ==
- views::MenuRunner::MENU_DELETED) {
+ if (menu_runner_->RunMenuAt(parent_widget_,
+ NULL,
+ gfx::Rect(point.x(), point.y(), 0, 0),
+ views::MENU_ANCHOR_TOPLEFT,
+ source_type) == views::MenuRunner::MENU_DELETED) {
return;
}
}

Powered by Google App Engine
This is Rietveld 408576698