| Index: ui/views/examples/native_theme_button_example.h
|
| diff --git a/ui/views/examples/native_theme_button_example.h b/ui/views/examples/native_theme_button_example.h
|
| index 59f5e97721c2e0c73559ce060a7c49ed8d76acd2..8b59fece6e0e746c762d340d9e3f39229d2e32f6 100644
|
| --- a/ui/views/examples/native_theme_button_example.h
|
| +++ b/ui/views/examples/native_theme_button_example.h
|
| @@ -10,7 +10,7 @@
|
| #include "ui/gfx/native_theme.h"
|
| #include "ui/views/examples/example_base.h"
|
| #include "views/controls/button/custom_button.h"
|
| -#include "views/controls/combobox/combobox.h"
|
| +#include "views/controls/combobox/combobox_listener.h"
|
| #include "views/native_theme_delegate.h"
|
| #include "views/native_theme_painter.h"
|
|
|
| @@ -24,7 +24,7 @@ namespace examples {
|
| // A subclass of button to test native theme rendering.
|
| class ExampleNativeThemeButton : public views::CustomButton,
|
| public views::NativeThemeDelegate,
|
| - public views::Combobox::Listener {
|
| + public views::ComboboxListener {
|
| public:
|
| ExampleNativeThemeButton(views::ButtonListener* listener,
|
| views::Combobox* cb_part,
|
| @@ -34,11 +34,11 @@ class ExampleNativeThemeButton : public views::CustomButton,
|
| std::string MessWithState();
|
|
|
| private:
|
| - // Overridden from View:
|
| + // Overridden from views::View:
|
| virtual gfx::Size GetPreferredSize() OVERRIDE;
|
| virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE;
|
|
|
| - // Overridden from views::Combobox::Listener:
|
| + // Overridden from views::ComboboxListener:
|
| virtual void ItemChanged(views::Combobox* combo_box,
|
| int prev_index,
|
| int new_index) OVERRIDE;
|
|
|