views/controls/menu/native_menu_x.cc - Issue 6155011: Implementing context menu for the new views textfield.

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/native_menu_x.cc

Issue 6155011: Implementing context menu for the new views textfield. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: resolved small merge conflict Created 9 years, 11 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:

Index: views/controls/menu/native_menu_x.cc

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

index a952ea2e73ae85d6230d4e177c740c6dbc6c0248..aca6776406e5828faeb345946f7efddb0fd0c259 100644

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

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

@@ -156,11 +156,9 @@ void NativeMenuX::UpdateMenuFromModel(SubmenuView* menu,

// MenuWrapper, public:

-#if !defined(OS_CHROMEOS)

// static

MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {

return new NativeMenuX(menu);

}

-#endif

} // namespace views