Revert 136996 - ui: Move NativeTheme files into ui/base/native_theme/ directory.

ui/views/controls/button/text_button.h

Index: ui/views/controls/button/text_button.h
===================================================================
--- ui/views/controls/button/text_button.h	(revision 137002)
+++ ui/views/controls/button/text_button.h	(working copy)
@@ -225,15 +225,15 @@
 
   // 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 @@
   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 @@
 
   // Overridden from TextButton:
   virtual void GetExtraParams(
-      ui::NativeTheme::ExtraParams* params) const OVERRIDE;
+      gfx::NativeTheme::ExtraParams* params) const OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(NativeTextButton);
 };