diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-06 20:47:54 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-06 20:47:54 +0000 |
| commit | b8836f23f53db0f9cc2154298100aa659d1738b2 (patch) | |
| tree | a4143f8d5dc644cdc993f9a091fcaba76bf007cb /views | |
| parent | fd4a62e1f408f8b591424a0893846853acd18aa1 (diff) | |
| download | chromium_src-b8836f23f53db0f9cc2154298100aa659d1738b2.zip chromium_src-b8836f23f53db0f9cc2154298100aa659d1738b2.tar.gz chromium_src-b8836f23f53db0f9cc2154298100aa659d1738b2.tar.bz2 | |
Fix static compile with touchui on chromeos.
BUG=static compile doesn't work with 'touchui=1 chromeos=1'
TEST=static compile should work with 'touchui=1 chromeos=1'
Review URL: http://codereview.chromium.org/5515007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68373 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/menu/native_menu_x.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/views/controls/menu/native_menu_x.cc b/views/controls/menu/native_menu_x.cc index 5653def..db47f7e 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 |