diff options
Diffstat (limited to 'ui/views/controls/button/text_button.h')
-rw-r--r-- | ui/views/controls/button/text_button.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ui/views/controls/button/text_button.h b/ui/views/controls/button/text_button.h index 2dd1cb8..2e1f285 100644 --- a/ui/views/controls/button/text_button.h +++ b/ui/views/controls/button/text_button.h @@ -225,15 +225,15 @@ class VIEWS_EXPORT TextButtonBase : public CustomButton, // Overridden from NativeThemeDelegate: virtual gfx::Rect GetThemePaintRect() const OVERRIDE; - virtual ui::NativeTheme::State GetThemeState( - ui::NativeTheme::ExtraParams* params) const OVERRIDE; + virtual gfx::NativeTheme::State GetThemeState( + gfx::NativeTheme::ExtraParams* params) const OVERRIDE; virtual const ui::Animation* GetThemeAnimation() const OVERRIDE; - virtual ui::NativeTheme::State GetBackgroundThemeState( - ui::NativeTheme::ExtraParams* params) const OVERRIDE; - virtual ui::NativeTheme::State GetForegroundThemeState( - ui::NativeTheme::ExtraParams* params) const OVERRIDE; + virtual gfx::NativeTheme::State GetBackgroundThemeState( + gfx::NativeTheme::ExtraParams* params) const OVERRIDE; + virtual gfx::NativeTheme::State GetForegroundThemeState( + gfx::NativeTheme::ExtraParams* params) const OVERRIDE; - virtual void GetExtraParams(ui::NativeTheme::ExtraParams* params) const; + virtual void GetExtraParams(gfx::NativeTheme::ExtraParams* params) const; virtual gfx::Rect GetTextBounds() const; @@ -353,11 +353,11 @@ class VIEWS_EXPORT TextButton : public TextButtonBase { virtual const SkBitmap& GetImageToPaint() const; // Overridden from NativeThemeDelegate: - virtual ui::NativeTheme::Part GetThemePart() const OVERRIDE; + virtual gfx::NativeTheme::Part GetThemePart() const OVERRIDE; // Overridden from TextButtonBase: virtual void GetExtraParams( - ui::NativeTheme::ExtraParams* params) const OVERRIDE; + gfx::NativeTheme::ExtraParams* params) const OVERRIDE; virtual gfx::Rect GetTextBounds() const OVERRIDE; private: @@ -413,7 +413,7 @@ class VIEWS_EXPORT NativeTextButton : public TextButton { // Overridden from TextButton: virtual void GetExtraParams( - ui::NativeTheme::ExtraParams* params) const OVERRIDE; + gfx::NativeTheme::ExtraParams* params) const OVERRIDE; DISALLOW_COPY_AND_ASSIGN(NativeTextButton); }; |