views/controls/menu/menu_model_adapter.cc - Issue 6893046: added CTRL+Click and SHIFT+Click handler for context menu, Back and Forward.

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: views/controls/menu/menu_model_adapter.cc

Issue 6893046: added CTRL+Click and SHIFT+Click handler for context menu, Back and Forward. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: make event_utils::DispositionFromEventFlags not view-specific. Created 9 years, 7 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: views/controls/menu/menu_model_adapter.cc

diff --git a/views/controls/menu/menu_model_adapter.cc b/views/controls/menu/menu_model_adapter.cc

index d2812c4502720559fb0ce9fbcfb480375a4f1c67..62c3e40eef87cbc94768caea22e9fa35dcd79bfb 100644

--- a/views/controls/menu/menu_model_adapter.cc

+++ b/views/controls/menu/menu_model_adapter.cc

@@ -55,10 +55,14 @@ void MenuModelAdapter::ExecuteCommand(int id, int mouse_event_flags) {

ui::MenuModel* model = menu_model_;

int index = 0;

if (ui::MenuModel::GetModelAndIndexForCommandId(id, &model, &index)) {

+#if 0

Ben Goodger (Google) 2011/05/31 16:00:00 ???

shinyak (Google) 2011/06/09 02:29:04 Done.

const int disposition =

ViewsDelegate::views_delegate->GetDispositionForEvent(

mouse_event_flags);

model->ActivatedAtWithDisposition(index, disposition);

+#else

+ model->ActivatedAtWithFlags(index, mouse_event_flags);

+#endif

return;

}

« ui/base/models/menu_model.h ('K') | « ui/base/models/simple_menu_model.cc ('k') | views/controls/menu/menu_model_adapter_unittest.cc » ('j') | no next file with comments »