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

ui/views/controls/button/text_button.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 #pragma once
 
 #include <string>
 
@@ skipping 207 matching lines @@
 
   // Updates text_size_ and max_text_size_ from the current text/font. This is
   // invoked when the font or text changes.
   void UpdateTextSize();
 
   // Calculate the size of the text size without setting any of the members.
   void CalculateTextSize(gfx::Size* text_size, int max_width);
 
   // 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;
 
   int ComputeCanvasStringFlags() const;
 
   // Calculate the bounds of the content of this button, including any extra
   // width needed on top of the text width.
   gfx::Rect GetContentBounds(int extra_width) const;
 
   // The text string that is displayed in the button.
@@ skipping 99 matching lines @@
 
   // Overridden from TextButtonBase:
   virtual void PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) OVERRIDE;
 
  protected:
   SkBitmap icon() const { return icon_; }
 
   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:
   // The position of the icon.
   IconPlacement icon_placement_;
 
   // An icon displayed with the text.
   SkBitmap icon_;
 
   // An optional different version of the icon for hover state.
@@ skipping 35 matching lines @@
   virtual std::string GetClassName() const OVERRIDE;
 
  private:
   void Init();
 
   // Overridden from View:
   virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
 
   // Overridden from TextButton:
   virtual void GetExtraParams(
-      ui::NativeTheme::ExtraParams* params) const OVERRIDE;
+      gfx::NativeTheme::ExtraParams* params) const OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(NativeTextButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_