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

ui/views/controls/scrollbar/native_scroll_bar_views.cc

 // 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.
 
 #include "ui/views/controls/scrollbar/native_scroll_bar_views.h"
 
 #include "base/logging.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
@@ skipping 23 matching lines @@
 
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual std::string GetClassName() const OVERRIDE {
     return "views/ScrollBarButton";
   }
 
  protected:
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
  private:
-  ui::NativeTheme::ExtraParams GetNativeThemeParams() const;
-  ui::NativeTheme::Part GetNativeThemePart() const;
-  ui::NativeTheme::State GetNativeThemeState() const;
+  gfx::NativeTheme::ExtraParams GetNativeThemeParams() const;
+  gfx::NativeTheme::Part GetNativeThemePart() const;
+  gfx::NativeTheme::State GetNativeThemeState() const;
 
   Type type_;
 };
 
 // Wrapper for the scroll thumb
 class ScrollBarThumb : public BaseScrollBarThumb {
  public:
   explicit ScrollBarThumb(BaseScrollBar* scroll_bar);
   virtual ~ScrollBarThumb();
 
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual std::string GetClassName() const OVERRIDE {
     return "views/ScrollBarThumb";
   }
 
  protected:
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
  private:
-  ui::NativeTheme::ExtraParams GetNativeThemeParams() const;
-  ui::NativeTheme::Part GetNativeThemePart() const;
-  ui::NativeTheme::State GetNativeThemeState() const;
+  gfx::NativeTheme::ExtraParams GetNativeThemeParams() const;
+  gfx::NativeTheme::Part GetNativeThemePart() const;
+  gfx::NativeTheme::State GetNativeThemeState() const;
 
   ScrollBar* scroll_bar_;
 };
 
 /////////////////////////////////////////////////////////////////////////////
 // ScrollBarButton
 
 ScrollBarButton::ScrollBarButton(
     ButtonListener* listener,
     Type type)
     : BaseScrollBarButton(listener),
       type_(type) {
   set_focusable(false);
   set_accessibility_focusable(false);
 }
 
 ScrollBarButton::~ScrollBarButton() {
 }
 
 gfx::Size ScrollBarButton::GetPreferredSize() {
-  const ui::NativeTheme* native_theme = ui::NativeTheme::instance();
+  const gfx::NativeTheme* native_theme = gfx::NativeTheme::instance();
   return native_theme->GetPartSize(GetNativeThemePart(),
                                    GetNativeThemeState(),
                                    GetNativeThemeParams());
 }
 
 void ScrollBarButton::OnPaint(gfx::Canvas* canvas) {
-  const ui::NativeTheme* native_theme = ui::NativeTheme::instance();
+  const gfx::NativeTheme* native_theme = gfx::NativeTheme::instance();
   gfx::Rect bounds(GetPreferredSize());
   native_theme->Paint(canvas->sk_canvas(), GetNativeThemePart(),
                       GetNativeThemeState(), bounds, GetNativeThemeParams());
 }
 
-ui::NativeTheme::ExtraParams ScrollBarButton::GetNativeThemeParams() const {
-  ui::NativeTheme::ExtraParams params;
+gfx::NativeTheme::ExtraParams
+    ScrollBarButton::GetNativeThemeParams() const {
+  gfx::NativeTheme::ExtraParams params;
 
   switch (state_) {
     case CustomButton::BS_HOT:
       params.scrollbar_arrow.is_hovering = true;
       break;
     default:
       params.scrollbar_arrow.is_hovering = false;
       break;
   }
 
   return params;
 }
 
-ui::NativeTheme::Part ScrollBarButton::GetNativeThemePart() const {
+gfx::NativeTheme::Part
+    ScrollBarButton::GetNativeThemePart() const {
   switch (type_) {
     case UP:
-      return ui::NativeTheme::kScrollbarUpArrow;
+      return gfx::NativeTheme::kScrollbarUpArrow;
     case DOWN:
-      return ui::NativeTheme::kScrollbarDownArrow;
+      return gfx::NativeTheme::kScrollbarDownArrow;
     case LEFT:
-      return ui::NativeTheme::kScrollbarLeftArrow;
+      return gfx::NativeTheme::kScrollbarLeftArrow;
     case RIGHT:
-      return ui::NativeTheme::kScrollbarRightArrow;
+      return gfx::NativeTheme::kScrollbarRightArrow;
     default:
-      return ui::NativeTheme::kScrollbarUpArrow;
+      return gfx::NativeTheme::kScrollbarUpArrow;
   }
 }
 
-ui::NativeTheme::State ScrollBarButton::GetNativeThemeState() const {
-  ui::NativeTheme::State state;
+gfx::NativeTheme::State
+    ScrollBarButton::GetNativeThemeState() const {
+  gfx::NativeTheme::State state;
 
   switch (state_) {
     case CustomButton::BS_HOT:
-      state = ui::NativeTheme::kHovered;
+      state = gfx::NativeTheme::kHovered;
       break;
     case CustomButton::BS_PUSHED:
-      state = ui::NativeTheme::kPressed;
+      state = gfx::NativeTheme::kPressed;
       break;
     case CustomButton::BS_DISABLED:
-      state = ui::NativeTheme::kDisabled;
+      state = gfx::NativeTheme::kDisabled;
       break;
     case CustomButton::BS_NORMAL:
     default:
-      state = ui::NativeTheme::kNormal;
+      state = gfx::NativeTheme::kNormal;
       break;
   }
 
   return state;
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // ScrollBarThumb
 
 ScrollBarThumb::ScrollBarThumb(BaseScrollBar* scroll_bar)
     : BaseScrollBarThumb(scroll_bar),
       scroll_bar_(scroll_bar) {
   set_focusable(false);
   set_accessibility_focusable(false);
 }
 
 ScrollBarThumb::~ScrollBarThumb() {
 }
 
 gfx::Size ScrollBarThumb::GetPreferredSize() {
-  const ui::NativeTheme* native_theme = ui::NativeTheme::instance();
+  const gfx::NativeTheme* native_theme = gfx::NativeTheme::instance();
   return native_theme->GetPartSize(GetNativeThemePart(),
                                    GetNativeThemeState(),
                                    GetNativeThemeParams());
 }
 
 void ScrollBarThumb::OnPaint(gfx::Canvas* canvas) {
-  const ui::NativeTheme* native_theme = ui::NativeTheme::instance();
+  const gfx::NativeTheme* native_theme = gfx::NativeTheme::instance();
 
   native_theme->Paint(canvas->sk_canvas(),
                       GetNativeThemePart(),
                       GetNativeThemeState(),
                       GetLocalBounds(),
                       GetNativeThemeParams());
 }
 
-ui::NativeTheme::ExtraParams ScrollBarThumb::GetNativeThemeParams() const {
-  ui::NativeTheme::ExtraParams params;
+gfx::NativeTheme::ExtraParams
+    ScrollBarThumb::GetNativeThemeParams() const {
+  gfx::NativeTheme::ExtraParams params;
 
   switch (GetState()) {
     case CustomButton::BS_HOT:
       params.scrollbar_thumb.is_hovering = true;
       break;
     default:
       params.scrollbar_thumb.is_hovering = false;
       break;
   }
 
   return params;
 }
 
-ui::NativeTheme::Part ScrollBarThumb::GetNativeThemePart() const {
+gfx::NativeTheme::Part ScrollBarThumb::GetNativeThemePart() const {
   if (scroll_bar_->IsHorizontal())
-    return ui::NativeTheme::kScrollbarHorizontalThumb;
-  return ui::NativeTheme::kScrollbarVerticalThumb;
+    return gfx::NativeTheme::kScrollbarHorizontalThumb;
+  return gfx::NativeTheme::kScrollbarVerticalThumb;
 }
 
-ui::NativeTheme::State ScrollBarThumb::GetNativeThemeState() const {
-  ui::NativeTheme::State state;
+gfx::NativeTheme::State ScrollBarThumb::GetNativeThemeState() const {
+  gfx::NativeTheme::State state;
 
   switch (GetState()) {
     case CustomButton::BS_HOT:
-      state = ui::NativeTheme::kHovered;
+      state = gfx::NativeTheme::kHovered;
       break;
     case CustomButton::BS_PUSHED:
-      state = ui::NativeTheme::kPressed;
+      state = gfx::NativeTheme::kPressed;
       break;
     case CustomButton::BS_DISABLED:
-      state = ui::NativeTheme::kDisabled;
+      state = gfx::NativeTheme::kDisabled;
       break;
     case CustomButton::BS_NORMAL:
     default:
-      state = ui::NativeTheme::kNormal;
+      state = gfx::NativeTheme::kNormal;
       break;
   }
 
   return state;
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeScrollBarViews, public:
 
 const char NativeScrollBarViews::kViewClassName[] =
     "views/NativeScrollBarViews";
 
 NativeScrollBarViews::NativeScrollBarViews(NativeScrollBar* scroll_bar)
     : BaseScrollBar(scroll_bar->IsHorizontal(),
                     new ScrollBarThumb(this)),
       native_scroll_bar_(scroll_bar) {
   set_controller(native_scroll_bar_->controller());
 
   if (native_scroll_bar_->IsHorizontal()) {
     prev_button_ = new ScrollBarButton(this, ScrollBarButton::LEFT);
     next_button_ = new ScrollBarButton(this, ScrollBarButton::RIGHT);
 
-    part_ = ui::NativeTheme::kScrollbarHorizontalTrack;
+    part_ = gfx::NativeTheme::kScrollbarHorizontalTrack;
   } else {
     prev_button_ = new ScrollBarButton(this, ScrollBarButton::UP);
     next_button_ = new ScrollBarButton(this, ScrollBarButton::DOWN);
 
-    part_ = ui::NativeTheme::kScrollbarVerticalTrack;
+    part_ = gfx::NativeTheme::kScrollbarVerticalTrack;
   }
 
-  state_ = ui::NativeTheme::kNormal;
+  state_ = gfx::NativeTheme::kNormal;
 
   AddChildView(prev_button_);
   AddChildView(next_button_);
 
   prev_button_->set_context_menu_controller(this);
   next_button_->set_context_menu_controller(this);
 }
 
 NativeScrollBarViews::~NativeScrollBarViews() {
 }
@@ skipping 10 matching lines @@
                             size.width(), size.height());
   } else {
     next_button_->SetBounds(0, height() - size.height(),
                             size.width(), size.height());
   }
 
   GetThumb()->SetBoundsRect(GetTrackBounds());
 }
 
 void NativeScrollBarViews::OnPaint(gfx::Canvas* canvas) {
-  const ui::NativeTheme* native_theme = ui::NativeTheme::instance();
+  const gfx::NativeTheme* native_theme = gfx::NativeTheme::instance();
   gfx::Rect bounds = GetTrackBounds();
 
   if (bounds.IsEmpty())
     return;
 
   params_.scrollbar_track.track_x = bounds.x();
   params_.scrollbar_track.track_y = bounds.y();
   params_.scrollbar_track.track_width = bounds.width();
   params_.scrollbar_track.track_height = bounds.height();
 
@@ skipping 80 matching lines @@
 // NativewScrollBarWrapper, public:
 
 // static
 NativeScrollBarWrapper* NativeScrollBarWrapper::CreateWrapper(
     NativeScrollBar* scroll_bar) {
   return new NativeScrollBarViews(scroll_bar);
 }
 
 // static
 int NativeScrollBarWrapper::GetHorizontalScrollBarHeight() {
-  const ui::NativeTheme* native_theme = ui::NativeTheme::instance();
+  const gfx::NativeTheme* native_theme = gfx::NativeTheme::instance();
 
-  ui::NativeTheme::ExtraParams button_params;
+  gfx::NativeTheme::ExtraParams button_params;
   button_params.scrollbar_arrow.is_hovering = false;
   gfx::Size button_size = native_theme->GetPartSize(
-      ui::NativeTheme::kScrollbarLeftArrow,
-      ui::NativeTheme::kNormal,
+      gfx::NativeTheme::kScrollbarLeftArrow,
+      gfx::NativeTheme::kNormal,
       button_params);
 
-  ui::NativeTheme::ExtraParams thumb_params;
+  gfx::NativeTheme::ExtraParams thumb_params;
   thumb_params.scrollbar_thumb.is_hovering = false;
   gfx::Size track_size = native_theme->GetPartSize(
-      ui::NativeTheme::kScrollbarHorizontalThumb,
-      ui::NativeTheme::kNormal,
+      gfx::NativeTheme::kScrollbarHorizontalThumb,
+      gfx::NativeTheme::kNormal,
       thumb_params);
 
   return std::max(track_size.height(), button_size.height());
 }
 
 // static
 int NativeScrollBarWrapper::GetVerticalScrollBarWidth() {
-  const ui::NativeTheme* native_theme = ui::NativeTheme::instance();
+  const gfx::NativeTheme* native_theme = gfx::NativeTheme::instance();
 
-  ui::NativeTheme::ExtraParams button_params;
+  gfx::NativeTheme::ExtraParams button_params;
   button_params.scrollbar_arrow.is_hovering = false;
   gfx::Size button_size = native_theme->GetPartSize(
-      ui::NativeTheme::kScrollbarUpArrow,
-      ui::NativeTheme::kNormal,
+      gfx::NativeTheme::kScrollbarUpArrow,
+      gfx::NativeTheme::kNormal,
       button_params);
 
-  ui::NativeTheme::ExtraParams thumb_params;
+  gfx::NativeTheme::ExtraParams thumb_params;
   thumb_params.scrollbar_thumb.is_hovering = false;
   gfx::Size track_size = native_theme->GetPartSize(
-      ui::NativeTheme::kScrollbarVerticalThumb,
-      ui::NativeTheme::kNormal,
+      gfx::NativeTheme::kScrollbarVerticalThumb,
+      gfx::NativeTheme::kNormal,
       thumb_params);
 
   return std::max(track_size.width(), button_size.width());
 }
 #endif
 
 }  // namespace views