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

ui/views/native_theme_painter.cc

Index: ui/views/native_theme_painter.cc
===================================================================
--- ui/views/native_theme_painter.cc	(revision 137002)
+++ ui/views/native_theme_painter.cc	(working copy)
@@ -18,36 +18,36 @@
 }
 
 gfx::Size NativeThemePainter::GetPreferredSize() {
-  const ui::NativeTheme* theme = ui::NativeTheme::instance();
-  ui::NativeTheme::ExtraParams extra;
-  ui::NativeTheme::State state = delegate_->GetThemeState(&extra);
+  const gfx::NativeTheme* theme = gfx::NativeTheme::instance();
+  gfx::NativeTheme::ExtraParams extra;
+  gfx::NativeTheme::State state = delegate_->GetThemeState(&extra);
   return theme->GetPartSize(delegate_->GetThemePart(), state, extra);
 }
 
 void NativeThemePainter::Paint(gfx::Canvas* canvas, const gfx::Size& size) {
-  const ui::NativeTheme* native_theme = ui::NativeTheme::instance();
-  ui::NativeTheme::Part part = delegate_->GetThemePart();
+  const gfx::NativeTheme* native_theme = gfx::NativeTheme::instance();
+  gfx::NativeTheme::Part part = delegate_->GetThemePart();
   gfx::Rect rect(size);
 
   if (delegate_->GetThemeAnimation() != NULL &&
       delegate_->GetThemeAnimation()->is_animating()) {
     // Paint background state.
-    ui::NativeTheme::ExtraParams prev_extra;
-    ui::NativeTheme::State prev_state =
+    gfx::NativeTheme::ExtraParams prev_extra;
+    gfx::NativeTheme::State prev_state =
         delegate_->GetBackgroundThemeState(&prev_extra);
     native_theme->Paint(canvas->sk_canvas(), part, prev_state, rect,
                         prev_extra);
 
     // Composite foreground state above it.
-    ui::NativeTheme::ExtraParams extra;
-    ui::NativeTheme::State state = delegate_->GetForegroundThemeState(&extra);
+    gfx::NativeTheme::ExtraParams extra;
+    gfx::NativeTheme::State state = delegate_->GetForegroundThemeState(&extra);
     int alpha = delegate_->GetThemeAnimation()->CurrentValueBetween(0, 255);
     canvas->SaveLayerAlpha(static_cast<uint8>(alpha));
     native_theme->Paint(canvas->sk_canvas(), part, state, rect, extra);
     canvas->Restore();
   } else {
-    ui::NativeTheme::ExtraParams extra;
-    ui::NativeTheme::State state = delegate_->GetThemeState(&extra);
+    gfx::NativeTheme::ExtraParams extra;
+    gfx::NativeTheme::State state = delegate_->GetThemeState(&extra);
     native_theme->Paint(canvas->sk_canvas(), part, state, rect, extra);
   }
 }