chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc - Issue 331993009: MacViews: Run native Cocoa context menus to support Services.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.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

« no previous file with comments | « chrome/browser/ui/views/menu_test_base.cc ('k') | chrome/browser/ui/views/status_icons/status_icon_win.cc » ('j') | ui/views/controls/menu/menu_runner.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc

diff --git a/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc b/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc

index d879b7115941ef4483c52d8a88022515046e8307..b9df373df40af6b095003a70d1ba0b7788691b57 100644

--- a/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc

+++ b/chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc

@@ -48,9 +48,8 @@ void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent,

? views::MENU_ANCHOR_BOTTOMCENTER

: views::MENU_ANCHOR_TOPLEFT;

- if (menu_runner_->RunMenuAt(parent, NULL, gfx::Rect(point, gfx::Size()),

- anchor_position, type, views::MenuRunner::HAS_MNEMONICS |

- views::MenuRunner::CONTEXT_MENU) ==

+ if (menu_runner_->RunMenuAt(

+ parent, NULL, gfx::Rect(point, gfx::Size()), anchor_position, type) ==

views::MenuRunner::MENU_DELETED)

return;

}

@@ -59,7 +58,9 @@ void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent,

// RenderViewContextMenuViews, protected:

void RenderViewContextMenuViews::PlatformInit() {

- menu_runner_.reset(new views::MenuRunner(&menu_model_));

+ menu_runner_.reset(new views::MenuRunner(

+ &menu_model_,

+ views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU));

}

void RenderViewContextMenuViews::PlatformCancel() {