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

Unified Diff: chrome/browser/ui/views/frame/browser_frame.cc

Issue 16979002: Add ContextMenuSourceType to views::ContextMenuController::ShowContextMenuForView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/frame/browser_frame.cc
diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc
index 965ab711fbff465bad47cd24596ddb2c091d65f3..3ecba53f4febebb17950aa6988e36b89797b2433 100644
--- a/chrome/browser/ui/views/frame/browser_frame.cc
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -156,8 +156,10 @@ void BrowserFrame::OnNativeWidgetActivationChanged(bool active) {
Widget::OnNativeWidgetActivationChanged(active);
}
-void BrowserFrame::ShowContextMenuForView(views::View* source,
- const gfx::Point& p) {
+void BrowserFrame::ShowContextMenuForView(
+ views::View* source,
+ const gfx::Point& p,
+ ui::ContextMenuSourceType source_type) {
if (chrome::IsRunningInForcedAppMode())
return;
@@ -170,8 +172,8 @@ void BrowserFrame::ShowContextMenuForView(views::View* source,
int hit_test = non_client_view()->NonClientHitTest(point_in_view_coords);
if (hit_test == HTCAPTION || hit_test == HTNOWHERE) {
menu_runner_.reset(new views::MenuRunner(GetSystemMenuModel()));
- if (menu_runner_->RunMenuAt(source->GetWidget(), NULL,
- gfx::Rect(p, gfx::Size(0,0)), views::MenuItemView::TOPLEFT,
+ if (menu_runner_->RunContextMenuAt(source->GetWidget(), NULL,
+ gfx::Rect(p, gfx::Size(0,0)), source_type,
views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU) ==
views::MenuRunner::MENU_DELETED)
return;

Powered by Google App Engine
This is Rietveld 408576698