Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(406)

Unified Diff: ui/views/controls/button/text_button.h

Issue 10310136: ui: Move NativeTheme files into ui/base/native_theme/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/button/radio_button.cc ('k') | ui/views/controls/button/text_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/text_button.h
diff --git a/ui/views/controls/button/text_button.h b/ui/views/controls/button/text_button.h
index 2e1f285670393ccf21aa3175c8aa1862c00fb008..2dd1cb863582505734ceebd4e9e6e903e7fc7cd4 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 gfx::NativeTheme::State GetThemeState(
- gfx::NativeTheme::ExtraParams* params) const OVERRIDE;
+ virtual ui::NativeTheme::State GetThemeState(
+ ui::NativeTheme::ExtraParams* params) const OVERRIDE;
virtual const ui::Animation* GetThemeAnimation() 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 ui::NativeTheme::State GetBackgroundThemeState(
+ ui::NativeTheme::ExtraParams* params) const OVERRIDE;
+ virtual ui::NativeTheme::State GetForegroundThemeState(
+ ui::NativeTheme::ExtraParams* params) const OVERRIDE;
- virtual void GetExtraParams(gfx::NativeTheme::ExtraParams* params) const;
+ virtual void GetExtraParams(ui::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 gfx::NativeTheme::Part GetThemePart() const OVERRIDE;
+ virtual ui::NativeTheme::Part GetThemePart() const OVERRIDE;
// Overridden from TextButtonBase:
virtual void GetExtraParams(
- gfx::NativeTheme::ExtraParams* params) const OVERRIDE;
+ ui::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(
- gfx::NativeTheme::ExtraParams* params) const OVERRIDE;
+ ui::NativeTheme::ExtraParams* params) const OVERRIDE;
DISALLOW_COPY_AND_ASSIGN(NativeTextButton);
};
« no previous file with comments | « ui/views/controls/button/radio_button.cc ('k') | ui/views/controls/button/text_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698