views/controls/menu/native_menu_x.cc - Issue 5515007: Fix static compile with touchui on chromeos.

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 5515007: Fix static compile with touchui on chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 10 years 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 5653def584102b086314c7df1dfe0b1a4432cc21..db47f7e273ace1a43de50e03c9d4465334d9d516 100644

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

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

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

// MenuWrapper, public:

+#if !defined(OS_CHROMEOS)

// static

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

return new NativeMenuX(menu);

}

+#endif

} // namespace views

« no previous file with comments | « no previous file | no next file » | no next file with comments »