ui: Move NativeTheme files into ui/base/native_theme/ directory.

BUG=103304,125844
R=ben@chromium.org
TBR=tony@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=136996

Review URL: https://chromiumcodereview.appspot.com/10310136

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137056 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 11 deletions

diff --git a/ui/views/native_theme_painter.cc b/ui/views/native_theme_painter.cc
index 454ed3d..8acb532 100644
--- a/ui/views/native_theme_painter.cc
+++ b/ui/views/native_theme_painter.cc
@@ -18,36 +18,36 @@ NativeThemePainter::NativeThemePainter(NativeThemeDelegate* delegate)
 }
 
 gfx::Size NativeThemePainter::GetPreferredSize() {
-  const gfx::NativeTheme* theme = gfx::NativeTheme::instance();
-  gfx::NativeTheme::ExtraParams extra;
-  gfx::NativeTheme::State state = delegate_->GetThemeState(&extra);
+  const ui::NativeTheme* theme = ui::NativeTheme::instance();
+  ui::NativeTheme::ExtraParams extra;
+  ui::NativeTheme::State state = delegate_->GetThemeState(&extra);
   return theme->GetPartSize(delegate_->GetThemePart(), state, extra);
 }
 
 void NativeThemePainter::Paint(gfx::Canvas* canvas, const gfx::Size& size) {
-  const gfx::NativeTheme* native_theme = gfx::NativeTheme::instance();
-  gfx::NativeTheme::Part part = delegate_->GetThemePart();
+  const ui::NativeTheme* native_theme = ui::NativeTheme::instance();
+  ui::NativeTheme::Part part = delegate_->GetThemePart();
   gfx::Rect rect(size);
 
   if (delegate_->GetThemeAnimation() != NULL &&
       delegate_->GetThemeAnimation()->is_animating()) {
     // Paint background state.
-    gfx::NativeTheme::ExtraParams prev_extra;
-    gfx::NativeTheme::State prev_state =
+    ui::NativeTheme::ExtraParams prev_extra;
+    ui::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.
-    gfx::NativeTheme::ExtraParams extra;
-    gfx::NativeTheme::State state = delegate_->GetForegroundThemeState(&extra);
+    ui::NativeTheme::ExtraParams extra;
+    ui::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 {
-    gfx::NativeTheme::ExtraParams extra;
-    gfx::NativeTheme::State state = delegate_->GetThemeState(&extra);
+    ui::NativeTheme::ExtraParams extra;
+    ui::NativeTheme::State state = delegate_->GetThemeState(&extra);
     native_theme->Paint(canvas->sk_canvas(), part, state, rect, extra);
   }
 }