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

ui/views/examples/native_theme_button_example.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_EXAMPLES_NATIVE_THEME_BUTTON_EXAMPLE_H_
 #define UI_VIEWS_EXAMPLES_NATIVE_THEME_BUTTON_EXAMPLE_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/base/native_theme/native_theme.h"
+#include "ui/gfx/native_theme.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/examples/example_base.h"
 #include "ui/views/native_theme_delegate.h"
 
 namespace views {
 class Combobox;
 class NativeThemePainter;
 
 namespace examples {
@@ skipping 14 matching lines @@
 
  private:
   // Overridden from View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void OnPaintBackground(gfx::Canvas* canvas)  OVERRIDE;
 
   // Overridden from ComboboxListener:
   virtual void OnSelectedIndexChanged(Combobox* combobox) OVERRIDE;
 
   // Overridden from NativeThemeDelegate:
-  virtual ui::NativeTheme::Part GetThemePart() const OVERRIDE;
+  virtual gfx::NativeTheme::Part GetThemePart() const OVERRIDE;
   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;
 
-  void GetExtraParams(ui::NativeTheme::ExtraParams* params) const;
+  void GetExtraParams(gfx::NativeTheme::ExtraParams* params) const;
 
   scoped_ptr<NativeThemePainter> painter_;
   Combobox* cb_part_;
   Combobox* cb_state_;
   int count_;
   bool is_checked_;
   bool is_indeterminate_;
 
   DISALLOW_COPY_AND_ASSIGN(ExampleNativeThemeButton);
 };
@@ skipping 17 matching lines @@
   scoped_ptr<ExampleComboboxModel> combobox_model_part_;
   scoped_ptr<ExampleComboboxModel> combobox_model_state_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeThemeButtonExample);
 };
 
 }  // namespace examples
 }  // namespace views
 
 #endif  // UI_VIEWS_EXAMPLES_NATIVE_THEME_BUTTON_EXAMPLE_H_