diff options
41 files changed, 38 insertions, 121 deletions
diff --git a/views/examples/bubble_example.cc b/views/examples/bubble_example.cc index 8ae8616..b855f42 100644 --- a/views/examples/bubble_example.cc +++ b/views/examples/bubble_example.cc @@ -59,11 +59,12 @@ class ExampleBubbleDelegateView : public views::BubbleDelegateView { const BubbleConfig& config_; }; -BubbleExample::BubbleExample(ExamplesMain* main) : ExampleBase(main) {} - -BubbleExample::~BubbleExample() {} +BubbleExample::BubbleExample(ExamplesMain* main) + : ExampleBase(main, "Bubble") { +} -std::wstring BubbleExample::GetExampleTitle() { return L"Bubble"; } +BubbleExample::~BubbleExample() { +} void BubbleExample::CreateExampleView(views::View* container) { layout_ = new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 1); diff --git a/views/examples/bubble_example.h b/views/examples/bubble_example.h index c9ba079..0201b00 100644 --- a/views/examples/bubble_example.h +++ b/views/examples/bubble_example.h @@ -35,7 +35,6 @@ class BubbleExample : public ExampleBase, virtual ~BubbleExample(); // Overridden from ExampleBase. - virtual std::wstring GetExampleTitle() OVERRIDE; virtual void CreateExampleView(views::View* container) OVERRIDE; private: diff --git a/views/examples/button_example.cc b/views/examples/button_example.cc index dee6662e..6f27449 100644 --- a/views/examples/button_example.cc +++ b/views/examples/button_example.cc @@ -13,7 +13,7 @@ namespace examples { ButtonExample::ButtonExample(ExamplesMain* main) - : ExampleBase(main), + : ExampleBase(main, "Text Button"), alignment_(views::TextButton::ALIGN_LEFT), use_native_theme_border_(false), icon_(NULL), @@ -25,10 +25,6 @@ ButtonExample::ButtonExample(ExamplesMain* main) ButtonExample::~ButtonExample() { } -std::wstring ButtonExample::GetExampleTitle() { - return L"Text Button"; -} - void ButtonExample::CreateExampleView(views::View* container) { views::TextButton* tb = new views::TextButton(this, L"Button"); button_ = tb; diff --git a/views/examples/button_example.h b/views/examples/button_example.h index aad1ff9..f631dbc 100644 --- a/views/examples/button_example.h +++ b/views/examples/button_example.h @@ -24,7 +24,6 @@ class ButtonExample : public ExampleBase, public views::ButtonListener { virtual ~ButtonExample(); // Overridden from ExampleBase: - virtual std::wstring GetExampleTitle() OVERRIDE; virtual void CreateExampleView(views::View* container) OVERRIDE; private: diff --git a/views/examples/combobox_example.cc b/views/examples/combobox_example.cc index ec711cd..a51cff9 100644 --- a/views/examples/combobox_example.cc +++ b/views/examples/combobox_example.cc @@ -32,16 +32,13 @@ class ComboboxModelExample : public ui::ComboboxModel { namespace examples { -ComboboxExample::ComboboxExample(ExamplesMain* main) : ExampleBase(main) { +ComboboxExample::ComboboxExample(ExamplesMain* main) + : ExampleBase(main, "Combo Box") { } ComboboxExample::~ComboboxExample() { } -std::wstring ComboboxExample::GetExampleTitle() { - return L"Combo Box"; -} - void ComboboxExample::CreateExampleView(views::View* container) { combobox_ = new views::Combobox(new ComboboxModelExample()); combobox_->set_listener(this); diff --git a/views/examples/combobox_example.h b/views/examples/combobox_example.h index 6bac840..0e50d6b 100644 --- a/views/examples/combobox_example.h +++ b/views/examples/combobox_example.h @@ -20,7 +20,6 @@ class ComboboxExample : public ExampleBase, virtual ~ComboboxExample(); // Overridden from ExampleBase: - virtual std::wstring GetExampleTitle() OVERRIDE; virtual void CreateExampleView(views::View* container) OVERRIDE; private: diff --git a/views/examples/double_split_view_example.cc b/views/examples/double_split_view_example.cc index 65a174a..0cd826c 100644 --- a/views/examples/double_split_view_example.cc +++ b/views/examples/double_split_view_example.cc @@ -45,16 +45,12 @@ gfx::Size SplittedView::GetMinimumSize() { namespace examples { DoubleSplitViewExample::DoubleSplitViewExample(ExamplesMain* main) - : ExampleBase(main) { + : ExampleBase(main, "Double Split View") { } DoubleSplitViewExample::~DoubleSplitViewExample() { } -std::wstring DoubleSplitViewExample::GetExampleTitle() { - return L"Double Split View"; -} - void DoubleSplitViewExample::CreateExampleView(views::View* container) { SplittedView* splitted_view_1 = new SplittedView(); SplittedView* splitted_view_2 = new SplittedView(); diff --git a/views/examples/double_split_view_example.h b/views/examples/double_split_view_example.h index 1183bad..0c151b6 100644 --- a/views/examples/double_split_view_example.h +++ b/views/examples/double_split_view_example.h @@ -22,7 +22,6 @@ class DoubleSplitViewExample : public ExampleBase { virtual ~DoubleSplitViewExample(); // Overridden from ExampleBase: - virtual std::wstring GetExampleTitle() OVERRIDE; virtual void CreateExampleView(views::View* container) OVERRIDE; private: diff --git a/views/examples/example_base.cc b/views/examples/example_base.cc index 0de8049..7a765bf 100644 --- a/views/examples/example_base.cc +++ b/views/examples/example_base.cc @@ -50,8 +50,8 @@ namespace examples { ExampleBase::~ExampleBase() {} -ExampleBase::ExampleBase(ExamplesMain* main) - : main_(main) { +ExampleBase::ExampleBase(ExamplesMain* main, const char* title) + : main_(main), example_title_(title) { container_ = new ContainerView(this); } diff --git a/views/examples/example_base.h b/views/examples/example_base.h index de8cc15..2f68b61 100644 --- a/views/examples/example_base.h +++ b/views/examples/example_base.h @@ -29,12 +29,10 @@ class ExampleBase { // Sub-classes should creates and add the views to the given parent. virtual void CreateExampleView(views::View* parent) = 0; - // Sub-classes should return the name of this test. - // It is used as the title of the tab displaying this test's controls. - virtual std::wstring GetExampleTitle() = 0; + const std::string& example_title() const { return example_title_; } protected: - explicit ExampleBase(ExamplesMain* main); + ExampleBase(ExamplesMain* main, const char* title); // Prints a message in the status area, at the bottom of the window. void PrintStatus(const char* format, ...); @@ -48,6 +46,9 @@ class ExampleBase { // The runner actually running this test. ExamplesMain* main_; + // Name of the example - used for the title of the tab. + std::string example_title_; + // The view containing example views. views::View* container_; diff --git a/views/examples/examples_main.cc b/views/examples/examples_main.cc index aa015fb..2eda948 100644 --- a/views/examples/examples_main.cc +++ b/views/examples/examples_main.cc @@ -114,7 +114,8 @@ void ExamplesMain::SetStatus(const std::string& status) { } void ExamplesMain::AddExample(ExampleBase* example) { - tabbed_pane_->AddTab(example->GetExampleTitle(), example->GetExampleView()); + tabbed_pane_->AddTab(UTF8ToWide(example->example_title()), + example->GetExampleView()); } bool ExamplesMain::CanResize() const { diff --git a/views/examples/link_example.cc b/views/examples/link_example.cc index 6f4411b..7233718 100644 --- a/views/examples/link_example.cc +++ b/views/examples/link_example.cc @@ -10,16 +10,13 @@ namespace examples { -LinkExample::LinkExample(ExamplesMain* main) : ExampleBase(main) { +LinkExample::LinkExample(ExamplesMain* main) + : ExampleBase(main, "Link") { } LinkExample::~LinkExample() { } -std::wstring LinkExample::GetExampleTitle() { - return L"Link"; -} - void LinkExample::CreateExampleView(views::View* container) { link_ = new views::Link(L"Click me!"); link_->set_listener(this); diff --git a/views/examples/link_example.h b/views/examples/link_example.h index d10994e..916b91a 100644 --- a/views/examples/link_example.h +++ b/views/examples/link_example.h @@ -24,7 +24,6 @@ class LinkExample : public ExampleBase, virtual ~LinkExample(); // Overridden from ExampleBase: - virtual std::wstring GetExampleTitle() OVERRIDE; virtual void CreateExampleView(views::View* container) OVERRIDE; private: diff --git a/views/examples/menu_example.cc b/views/examples/menu_example.cc index 56466ed..04e28b6 100644 --- a/views/examples/menu_example.cc +++ b/views/examples/menu_example.cc @@ -197,16 +197,12 @@ void ExampleMenuButton::RunMenu(views::View* source, const gfx::Point& point) { namespace examples { MenuExample::MenuExample(ExamplesMain* main) - : ExampleBase(main) { + : ExampleBase(main, "Menu") { } MenuExample::~MenuExample() { } -std::wstring MenuExample::GetExampleTitle() { - return L"Menu"; -} - void MenuExample::CreateExampleView(views::View* container) { // views::Menu2 is not a sub class of View, hence we cannot directly // add to the continer. Instead, we add a button to open a menu. diff --git a/views/examples/menu_example.h b/views/examples/menu_example.h index 26f49fe..27a93c8 100644 --- a/views/examples/menu_example.h +++ b/views/examples/menu_example.h @@ -21,7 +21,6 @@ class MenuExample : public ExampleBase { virtual ~MenuExample(); // Overridden from ExampleBase: - virtual std::wstring GetExampleTitle() OVERRIDE; virtual void CreateExampleView(views::View* container) OVERRIDE; private: diff --git a/views/examples/message_box_example.cc b/views/examples/message_box_example.cc index b99f7ab..b46eb63 100644 --- a/views/examples/message_box_example.cc +++ b/views/examples/message_box_example.cc @@ -12,16 +12,12 @@ namespace examples { MessageBoxExample::MessageBoxExample(ExamplesMain* main) - : ExampleBase(main) { + : ExampleBase(main, "Message Box View") { } MessageBoxExample::~MessageBoxExample() { } -std::wstring MessageBoxExample::GetExampleTitle() { - return L"Message Box View"; -} - void MessageBoxExample::CreateExampleView(views::View* container) { message_box_view_ = new views::MessageBoxView( 0, L"Message Box Message", L"Default Prompt"); diff --git a/views/examples/message_box_example.h b/views/examples/message_box_example.h index c43da02..d977869 100644 --- a/views/examples/message_box_example.h +++ b/views/examples/message_box_example.h @@ -27,7 +27,6 @@ class MessageBoxExample : public ExampleBase, virtual ~MessageBoxExample(); // Overridden from ExampleBase: - virtual std::wstring GetExampleTitle() OVERRIDE; virtual void CreateExampleView(views::View* container) OVERRIDE; private: diff --git a/views/examples/native_theme_button_example.cc b/views/examples/native_theme_button_example.cc index 8d6f16c..d907893 100644 --- a/views/examples/native_theme_button_example.cc +++ b/views/examples/native_theme_button_example.cc @@ -218,16 +218,12 @@ void ExampleNativeThemeButton::OnPaintBackground(gfx::Canvas* canvas) { //////////////////////////////////////////////////////////////////////////////// NativeThemeButtonExample::NativeThemeButtonExample(ExamplesMain* main) - : ExampleBase(main) { + : ExampleBase(main, "Native Theme Button") { } NativeThemeButtonExample::~NativeThemeButtonExample() { } -std::wstring NativeThemeButtonExample::GetExampleTitle() { - return L"Native Theme Button"; -} - void NativeThemeButtonExample::CreateExampleView(views::View* container) { views::GridLayout* layout = new views::GridLayout(container); container->SetLayoutManager(layout); diff --git a/views/examples/native_theme_button_example.h b/views/examples/native_theme_button_example.h index 06b0f57..7fcf993 100644 --- a/views/examples/native_theme_button_example.h +++ b/views/examples/native_theme_button_example.h @@ -75,7 +75,6 @@ class NativeThemeButtonExample : public ExampleBase, virtual ~NativeThemeButtonExample(); // Overridden from ExampleBase: - virtual std::wstring GetExampleTitle() OVERRIDE; virtual void CreateExampleView(views::View* container) OVERRIDE; private: diff --git a/views/examples/native_theme_checkbox_example.cc b/views/examples/native_theme_checkbox_example.cc index b3306da..ac09a2d 100644 --- a/views/examples/native_theme_checkbox_example.cc +++ b/views/examples/native_theme_checkbox_example.cc @@ -12,17 +12,13 @@ namespace examples { NativeThemeCheckboxExample::NativeThemeCheckboxExample(ExamplesMain* main) - : ExampleBase(main), + : ExampleBase(main, "Checkbox"), count_(0) { } NativeThemeCheckboxExample::~NativeThemeCheckboxExample() { } -std::wstring NativeThemeCheckboxExample::GetExampleTitle() { - return L"Checkbox"; -} - void NativeThemeCheckboxExample::CreateExampleView(views::View* container) { button_ = new views::Checkbox(L"Checkbox"); button_->set_listener(this); diff --git a/views/examples/native_theme_checkbox_example.h b/views/examples/native_theme_checkbox_example.h index 21faf97..b0b5130 100644 --- a/views/examples/native_theme_checkbox_example.h +++ b/views/examples/native_theme_checkbox_example.h @@ -25,7 +25,6 @@ class NativeThemeCheckboxExample : public ExampleBase, virtual ~NativeThemeCheckboxExample(); // Overridden from ExampleBase: - virtual std::wstring GetExampleTitle() OVERRIDE; virtual void CreateExampleView(views::View* container) OVERRIDE; private: diff --git a/views/examples/native_widget_views_example.cc b/views/examples/native_widget_views_example.cc index f350df9..e46a5532 100644 --- a/views/examples/native_widget_views_example.cc +++ b/views/examples/native_widget_views_example.cc @@ -55,16 +55,12 @@ class TestContentView : public views::View, }; NativeWidgetViewsExample::NativeWidgetViewsExample(ExamplesMain* main) - : ExampleBase(main) { + : ExampleBase(main, "NativeWidgetViews") { } NativeWidgetViewsExample::~NativeWidgetViewsExample() { } -std::wstring NativeWidgetViewsExample::GetExampleTitle() { - return L"NativeWidgetViews"; -} - void NativeWidgetViewsExample::CreateExampleView(views::View* container) { views::Widget* widget = new views::Widget; views::NativeWidgetViews* nwv = new views::NativeWidgetViews(widget); diff --git a/views/examples/native_widget_views_example.h b/views/examples/native_widget_views_example.h index b3d8b96..d5a2991 100644 --- a/views/examples/native_widget_views_example.h +++ b/views/examples/native_widget_views_example.h @@ -20,7 +20,6 @@ class NativeWidgetViewsExample : public ExampleBase { virtual ~NativeWidgetViewsExample(); // Overridden from ExampleBase: - virtual std::wstring GetExampleTitle() OVERRIDE; virtual void CreateExampleView(views::View* container) OVERRIDE; private: diff --git a/views/examples/radio_button_example.cc b/views/examples/radio_button_example.cc index 33ea46d..41bdfb1 100644 --- a/views/examples/radio_button_example.cc +++ b/views/examples/radio_button_example.cc @@ -12,16 +12,12 @@ namespace examples { RadioButtonExample::RadioButtonExample(ExamplesMain* main) - : ExampleBase(main), count_(0) { + : ExampleBase(main, "Radio Button"), count_(0) { } RadioButtonExample::~RadioButtonExample() { } -std::wstring RadioButtonExample::GetExampleTitle() { - return L"Radio Button"; -} - void RadioButtonExample::CreateExampleView(views::View* container) { select_ = new views::TextButton(this, L"Select"); status_ = new views::TextButton(this, L"Show Status"); diff --git a/views/examples/radio_button_example.h b/views/examples/radio_button_example.h index c42d176..06754c1 100644 --- a/views/examples/radio_button_example.h +++ b/views/examples/radio_button_example.h @@ -26,7 +26,6 @@ class RadioButtonExample : public ExampleBase, virtual ~RadioButtonExample(); // Overridden from ExampleBase: - virtual std::wstring GetExampleTitle() OVERRIDE; virtual void CreateExampleView(views::View* container) OVERRIDE; private: diff --git a/views/examples/scroll_view_example.cc b/views/examples/scroll_view_example.cc index 3f47a15..da66359 100644 --- a/views/examples/scroll_view_example.cc +++ b/views/examples/scroll_view_example.cc @@ -47,16 +47,12 @@ class ScrollViewExample::ScrollableView : public views::View { }; ScrollViewExample::ScrollViewExample(ExamplesMain* main) - : ExampleBase(main) { + : ExampleBase(main, "Scroll View") { } ScrollViewExample::~ScrollViewExample() { } -std::wstring ScrollViewExample::GetExampleTitle() { - return L"Scroll View"; -} - void ScrollViewExample::CreateExampleView(views::View* container) { wide_ = new views::TextButton(this, L"Wide"); tall_ = new views::TextButton(this, L"Tall"); diff --git a/views/examples/scroll_view_example.h b/views/examples/scroll_view_example.h index 4e26d6e..7441b13 100644 --- a/views/examples/scroll_view_example.h +++ b/views/examples/scroll_view_example.h @@ -23,7 +23,6 @@ class ScrollViewExample : public ExampleBase, virtual ~ScrollViewExample(); // Overridden from ExampleBase: - virtual std::wstring GetExampleTitle() OVERRIDE; virtual void CreateExampleView(views::View* container) OVERRIDE; private: diff --git a/views/examples/single_split_view_example.cc b/views/examples/single_split_view_example.cc index b78ec03..35932c7 100644 --- a/views/examples/single_split_view_example.cc +++ b/views/examples/single_split_view_example.cc @@ -54,16 +54,12 @@ void SplittedView::Layout() { namespace examples { SingleSplitViewExample::SingleSplitViewExample(ExamplesMain* main) - : ExampleBase(main) { + : ExampleBase(main, "Single Split View") { } SingleSplitViewExample::~SingleSplitViewExample() { } -std::wstring SingleSplitViewExample::GetExampleTitle() { - return L"Single Split View"; -} - void SingleSplitViewExample::CreateExampleView(views::View* container) { SplittedView* splitted_view_1 = new SplittedView; SplittedView* splitted_view_2 = new SplittedView; diff --git a/views/examples/single_split_view_example.h b/views/examples/single_split_view_example.h index f53b6df..64377fb 100644 --- a/views/examples/single_split_view_example.h +++ b/views/examples/single_split_view_example.h @@ -22,7 +22,6 @@ class SingleSplitViewExample : public ExampleBase { virtual ~SingleSplitViewExample(); // Overridden from ExampleBase: - virtual std::wstring GetExampleTitle() OVERRIDE; virtual void CreateExampleView(views::View* container) OVERRIDE; private: diff --git a/views/examples/tabbed_pane_example.cc b/views/examples/tabbed_pane_example.cc index 3e59476..c5c0b81 100644 --- a/views/examples/tabbed_pane_example.cc +++ b/views/examples/tabbed_pane_example.cc @@ -10,16 +10,12 @@ namespace examples { TabbedPaneExample::TabbedPaneExample(ExamplesMain* main) - : ExampleBase(main) { + : ExampleBase(main, "Tabbed Pane") { } TabbedPaneExample::~TabbedPaneExample() { } -std::wstring TabbedPaneExample::GetExampleTitle() { - return L"Tabbed Pane"; -} - void TabbedPaneExample::CreateExampleView(views::View* container) { tabbed_pane_ = new views::TabbedPane(); tabbed_pane_->set_listener(this); diff --git a/views/examples/tabbed_pane_example.h b/views/examples/tabbed_pane_example.h index aa50c48..c7345b8 100644 --- a/views/examples/tabbed_pane_example.h +++ b/views/examples/tabbed_pane_example.h @@ -27,7 +27,6 @@ class TabbedPaneExample : public ExampleBase, virtual ~TabbedPaneExample(); // ExampleBase: - virtual std::wstring GetExampleTitle() OVERRIDE; virtual void CreateExampleView(views::View* container) OVERRIDE; private: diff --git a/views/examples/table2_example.cc b/views/examples/table2_example.cc index d197528..028895b 100644 --- a/views/examples/table2_example.cc +++ b/views/examples/table2_example.cc @@ -13,16 +13,12 @@ namespace examples { Table2Example::Table2Example(ExamplesMain* main) - : ExampleBase(main) { + : ExampleBase(main, "Table2") { } Table2Example::~Table2Example() { } -std::wstring Table2Example::GetExampleTitle() { - return L"Table2"; -} - void Table2Example::CreateExampleView(views::View* container) { column1_visible_checkbox_ = new views::Checkbox(L"Fruit column visible"); column1_visible_checkbox_->SetChecked(true); diff --git a/views/examples/table2_example.h b/views/examples/table2_example.h index ebd3f74..19ffb4d 100644 --- a/views/examples/table2_example.h +++ b/views/examples/table2_example.h @@ -33,7 +33,6 @@ class Table2Example : public ExampleBase, virtual ~Table2Example(); // Overridden from ExampleBase: - virtual std::wstring GetExampleTitle() OVERRIDE; virtual void CreateExampleView(views::View* container) OVERRIDE; // Overridden from TableModel: diff --git a/views/examples/table_example.cc b/views/examples/table_example.cc index b653459..62cc2bf 100644 --- a/views/examples/table_example.cc +++ b/views/examples/table_example.cc @@ -12,12 +12,11 @@ namespace examples { -TableExample::TableExample(ExamplesMain* main) : ExampleBase(main) {} - -TableExample::~TableExample() {} +TableExample::TableExample(ExamplesMain* main) + : ExampleBase(main, "Table") { +} -std::wstring TableExample::GetExampleTitle() { - return L"Table"; +TableExample::~TableExample() { } void TableExample::CreateExampleView(views::View* container) { diff --git a/views/examples/table_example.h b/views/examples/table_example.h index 74b0227..6c81059 100644 --- a/views/examples/table_example.h +++ b/views/examples/table_example.h @@ -34,7 +34,6 @@ class TableExample : public ExampleBase, virtual ~TableExample(); // ExampleBase: - virtual std::wstring GetExampleTitle() OVERRIDE; virtual void CreateExampleView(views::View* container) OVERRIDE; // ui::TableModel: diff --git a/views/examples/textfield_example.cc b/views/examples/textfield_example.cc index 562b59a..f04d68f 100644 --- a/views/examples/textfield_example.cc +++ b/views/examples/textfield_example.cc @@ -15,16 +15,12 @@ namespace examples { TextfieldExample::TextfieldExample(ExamplesMain* main) - : ExampleBase(main) { + : ExampleBase(main, "Textfield") { } TextfieldExample::~TextfieldExample() { } -std::wstring TextfieldExample::GetExampleTitle() { - return L"Textfield"; -} - void TextfieldExample::CreateExampleView(views::View* container) { name_ = new views::Textfield(); password_ = new views::Textfield(views::Textfield::STYLE_PASSWORD); diff --git a/views/examples/textfield_example.h b/views/examples/textfield_example.h index 608a3e7..86ae3d5 100644 --- a/views/examples/textfield_example.h +++ b/views/examples/textfield_example.h @@ -26,7 +26,6 @@ class TextfieldExample : public ExampleBase, virtual ~TextfieldExample(); // ExampleBase: - virtual std::wstring GetExampleTitle() OVERRIDE; virtual void CreateExampleView(views::View* container) OVERRIDE; private: diff --git a/views/examples/throbber_example.cc b/views/examples/throbber_example.cc index 495b71f..fb5d30d 100644 --- a/views/examples/throbber_example.cc +++ b/views/examples/throbber_example.cc @@ -46,16 +46,12 @@ class ThrobberView : public views::View { namespace examples { ThrobberExample::ThrobberExample(ExamplesMain* main) - : ExampleBase(main) { + : ExampleBase(main, "Throbber") { } ThrobberExample::~ThrobberExample() { } -std::wstring ThrobberExample::GetExampleTitle() { - return L"Throbber"; -} - void ThrobberExample::CreateExampleView(views::View* container) { container->SetLayoutManager(new views::FillLayout()); container->AddChildView(new ThrobberView()); diff --git a/views/examples/throbber_example.h b/views/examples/throbber_example.h index 9cbc160b..554fcdc2 100644 --- a/views/examples/throbber_example.h +++ b/views/examples/throbber_example.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -20,7 +20,6 @@ class ThrobberExample : public ExampleBase { virtual ~ThrobberExample(); // Overridden from ExampleBase: - virtual std::wstring GetExampleTitle(); virtual void CreateExampleView(views::View* container); private: diff --git a/views/examples/widget_example.cc b/views/examples/widget_example.cc index a2c834c..eba7bae 100644 --- a/views/examples/widget_example.cc +++ b/views/examples/widget_example.cc @@ -41,16 +41,12 @@ class CenterLayout : public views::LayoutManager { namespace examples { WidgetExample::WidgetExample(ExamplesMain* main) - : ExampleBase(main) { + : ExampleBase(main, "Widget") { } WidgetExample::~WidgetExample() { } -std::wstring WidgetExample::GetExampleTitle() { - return L"Widget"; -} - void WidgetExample::CreateExampleView(views::View* container) { container->SetLayoutManager( new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 2)); diff --git a/views/examples/widget_example.h b/views/examples/widget_example.h index 14ddb65..6dbf450 100644 --- a/views/examples/widget_example.h +++ b/views/examples/widget_example.h @@ -23,7 +23,6 @@ class WidgetExample : public ExampleBase, public views::ButtonListener { virtual ~WidgetExample(); // Overridden from ExampleBase: - virtual std::wstring GetExampleTitle() OVERRIDE; virtual void CreateExampleView(views::View* container) OVERRIDE; private: |