diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-19 15:47:02 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-19 15:47:02 +0000 |
| commit | 74cee5d1939c5939caa219976e83e5194562d9e6 (patch) | |
| tree | 0269880bb6d81a3666549df98158c2dcb67b863d /ui/views/examples/examples_window.cc | |
| parent | a0cb60a984e8295532a4c4a150c1af77df4ef79d (diff) | |
| download | chromium_src-74cee5d1939c5939caa219976e83e5194562d9e6.zip chromium_src-74cee5d1939c5939caa219976e83e5194562d9e6.tar.gz chromium_src-74cee5d1939c5939caa219976e83e5194562d9e6.tar.bz2 | |
views/examples: Get MenuExample to work under ash_shell and linux_chromeos config.
This patches removes the usage of the deprecated Menu2 API.
BUG=117092
TEST=chromeos=1, ash_shell, views examples->menu works fine.
R=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9717027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127477 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/examples/examples_window.cc')
| -rw-r--r-- | ui/views/examples/examples_window.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/ui/views/examples/examples_window.cc b/ui/views/examples/examples_window.cc index f650b10..d5addc3 100644 --- a/ui/views/examples/examples_window.cc +++ b/ui/views/examples/examples_window.cc @@ -22,6 +22,7 @@ #include "ui/views/examples/combobox_example.h" #include "ui/views/examples/double_split_view_example.h" #include "ui/views/examples/link_example.h" +#include "ui/views/examples/menu_example.h" #include "ui/views/examples/message_box_example.h" #include "ui/views/examples/native_theme_button_example.h" #include "ui/views/examples/native_theme_checkbox_example.h" @@ -43,10 +44,6 @@ #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" -#if !defined(USE_AURA) -#include "ui/views/examples/menu_example.h" -#endif - namespace views { namespace examples { @@ -161,16 +158,13 @@ class ExamplesWindowContents : public WidgetDelegateView, // Adds all the individual examples to the combobox model. void AddExamples() { - combobox_model_.AddExample(new TreeViewExample); - combobox_model_.AddExample(new TableExample); + // Please keep this list in alphabetical order! combobox_model_.AddExample(new BubbleExample); combobox_model_.AddExample(new ButtonExample); combobox_model_.AddExample(new ComboboxExample); combobox_model_.AddExample(new DoubleSplitViewExample); combobox_model_.AddExample(new LinkExample); -#if !defined(USE_AURA) combobox_model_.AddExample(new MenuExample); -#endif combobox_model_.AddExample(new MessageBoxExample); combobox_model_.AddExample(new NativeThemeButtonExample); combobox_model_.AddExample(new NativeThemeCheckboxExample); @@ -180,9 +174,11 @@ class ExamplesWindowContents : public WidgetDelegateView, combobox_model_.AddExample(new SingleSplitViewExample); combobox_model_.AddExample(new SliderExample); combobox_model_.AddExample(new TabbedPaneExample); + combobox_model_.AddExample(new TableExample); combobox_model_.AddExample(new TextExample); combobox_model_.AddExample(new TextfieldExample); combobox_model_.AddExample(new ThrobberExample); + combobox_model_.AddExample(new TreeViewExample); combobox_model_.AddExample(new WidgetExample); } |