chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc - Issue 7720012: Moves ownership of MenuItemView to MenuRunner as well as responbility

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/tab_contents/render_view_context_menu_views.cc

Issue 7720012: Moves ownership of MenuItemView to MenuRunner as well as responbility (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix unit test Created 9 years, 4 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

« chrome/browser/chromeos/status/network_menu.cc ('K') | « chrome/browser/ui/views/menu_model_adapter_test.cc ('k') | chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 41194b471773e4e200fecc1df8ee8b0a02567e4c..cdf0ba934fa6cdaa5a9905766016a8f01ab773ba 100644

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

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

@@ -48,9 +48,11 @@ void RenderViewContextMenuViews::RunMenuAt(int x, int y) {

static_cast<TabContentsViewViews*>(source_tab_contents_->view());

views::Widget* parent = tab->GetTopLevelWidget();

#endif

- menu_runner_->RunMenuAt(parent, NULL,

- gfx::Rect(gfx::Point(x, y), gfx::Size()),

- views::MenuItemView::TOPLEFT, true);

+ if (menu_runner_->RunMenuAt(parent, NULL,

+ gfx::Rect(gfx::Point(x, y), gfx::Size()),

+ views::MenuItemView::TOPLEFT, views::MenuRunner::HAS_MNEMONICS) ==

+ views::MenuRunner::MENU_DELETED)

+ return;

}

#if defined(OS_WIN)