diff options
Diffstat (limited to 'chromium/ui/views/examples/text_example.h')
| -rw-r--r-- | chromium/ui/views/examples/text_example.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/chromium/ui/views/examples/text_example.h b/chromium/ui/views/examples/text_example.h index 007f5194522..18ebaabdd74 100644 --- a/chromium/ui/views/examples/text_example.h +++ b/chromium/ui/views/examples/text_example.h @@ -5,8 +5,7 @@ #ifndef UI_VIEWS_EXAMPLES_TEXT_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_TEXT_EXAMPLE_H_ -#include "base/basictypes.h" -#include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/combobox/combobox_listener.h" @@ -20,14 +19,14 @@ namespace examples { class ExampleComboboxModel; -class TextExample : public ExampleBase, - public ButtonListener, - public ComboboxListener { +class VIEWS_EXAMPLES_EXPORT TextExample : public ExampleBase, + public ButtonListener, + public ComboboxListener { public: TextExample(); virtual ~TextExample(); - // Overridden from ExampleBase: + // ExampleBase: virtual void CreateExampleView(View* container) OVERRIDE; private: @@ -40,11 +39,11 @@ class TextExample : public ExampleBase, const char** strings, int count); - // Overridden from ButtonListener: + // ButtonListener: virtual void ButtonPressed(Button* button, const ui::Event& event) OVERRIDE; - // Overridden from ComboboxListener: - virtual void OnSelectedIndexChanged(Combobox* combobox) OVERRIDE; + // ComboboxListener: + virtual void OnPerformAction(Combobox* combobox) OVERRIDE; class TextExampleView; // The content of the scroll view. |