diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-06 19:45:08 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-06 19:45:08 +0000 |
| commit | cbe4cb648cd71ac0dab89050f75eff44530d1894 (patch) | |
| tree | cf17f7932f819bb1e6fc1cfb1eafaeadaf84c2fd /views | |
| parent | 1b2707bbf9bfe5d9f8210fb1d8511a4f32e591c9 (diff) | |
| download | chromium_src-cbe4cb648cd71ac0dab89050f75eff44530d1894.zip chromium_src-cbe4cb648cd71ac0dab89050f75eff44530d1894.tar.gz chromium_src-cbe4cb648cd71ac0dab89050f75eff44530d1894.tar.bz2 | |
Add CreateWrapper to views/examples/examples_base.cc
Necessary for view_examples to compile with GYP_DEFINES="chromeos=1".
BUG=http://code.google.com/p/chromium-os/issues/detail?id=7409 (temporary fix)
TEST=build all in chrome repo with chromeos=1
Review URL: http://codereview.chromium.org/3614008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61691 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/examples/example_base.cc | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/views/examples/example_base.cc b/views/examples/example_base.cc index 149ea52..d61d88f 100644 --- a/views/examples/example_base.cc +++ b/views/examples/example_base.cc @@ -12,6 +12,10 @@ #include "views/controls/tabbed_pane/tabbed_pane.h" #include "views/examples/examples_main.h" +#if defined(OS_CHROMEOS) +#include "views/controls/menu/native_menu_gtk.h" +#endif + namespace { using views::View; @@ -49,6 +53,19 @@ class ContainerView : public View { } // namespace +namespace views { + +// OS_CHROMEOS requires a MenuWrapper::CreateWrapper implementation. +// TODO(oshima): Fix chromium-os:7409 so that this isn't required. +#if defined(OS_CHROMEOS) +// static +MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) { + return new NativeMenuGtk(menu); +} +#endif // OS_CHROMEOS + +} // namespace views + namespace examples { ExampleBase::ExampleBase(ExamplesMain* main) |