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

ui/views/controls/button/text_button.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/button/text_button.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/events/event.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "skia/ext/skia_utils_win.h"
-#include "ui/base/native_theme/native_theme_win.h"
+#include "ui/gfx/native_theme_win.h"
 #include "ui/gfx/platform_font_win.h"
 #endif
 
 namespace views {
 
 #if defined(OS_WIN)
 // The min size in DLUs comes from
 // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dnwue/html/ch14e.asp
 static const int kMinWidthDLUs = 50;
 static const int kMinHeightDLUs = 14;
@@ skipping 169 matching lines @@
     NativeThemeDelegate* delegate)
     : delegate_(delegate) {
 }
 
 TextButtonNativeThemeBorder::~TextButtonNativeThemeBorder() {
 }
 
 void TextButtonNativeThemeBorder::Paint(const View& view,
                                         gfx::Canvas* canvas) const {
   const TextButtonBase* tb = static_cast<const TextButton*>(&view);
-  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(delegate_->GetThemePaintRect());
 
   if (tb->show_multiple_icon_states() &&
       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);
   }
 }
 
 void TextButtonNativeThemeBorder::GetInsets(gfx::Insets* insets) const {
   insets->Set(kPreferredNativeThemePaddingVertical,
               kPreferredNativeThemePaddingHorizontal,
               kPreferredNativeThemePaddingVertical,
               kPreferredNativeThemePaddingHorizontal);
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // TextButtonBase, public:
 
 TextButtonBase::TextButtonBase(ButtonListener* listener, const string16& text)
     : CustomButton(listener),
       alignment_(ALIGN_LEFT),
       font_(ResourceBundle::GetSharedInstance().GetFont(
           ResourceBundle::BaseFont)),
-      color_(ui::NativeTheme::instance()->GetSystemColor(
-          ui::NativeTheme::kColorId_TextButtonEnabledColor)),
-      color_enabled_(ui::NativeTheme::instance()->GetSystemColor(
-          ui::NativeTheme::kColorId_TextButtonEnabledColor)),
-      color_disabled_(ui::NativeTheme::instance()->GetSystemColor(
-          ui::NativeTheme::kColorId_TextButtonDisabledColor)),
-      color_highlight_(ui::NativeTheme::instance()->GetSystemColor(
-          ui::NativeTheme::kColorId_TextButtonHighlightColor)),
-      color_hover_(ui::NativeTheme::instance()->GetSystemColor(
-          ui::NativeTheme::kColorId_TextButtonHoverColor)),
+      color_(gfx::NativeTheme::instance()->GetSystemColor(
+          gfx::NativeTheme::kColorId_TextButtonEnabledColor)),
+      color_enabled_(gfx::NativeTheme::instance()->GetSystemColor(
+          gfx::NativeTheme::kColorId_TextButtonEnabledColor)),
+      color_disabled_(gfx::NativeTheme::instance()->GetSystemColor(
+          gfx::NativeTheme::kColorId_TextButtonDisabledColor)),
+      color_highlight_(gfx::NativeTheme::instance()->GetSystemColor(
+          gfx::NativeTheme::kColorId_TextButtonHighlightColor)),
+      color_hover_(gfx::NativeTheme::instance()->GetSystemColor(
+          gfx::NativeTheme::kColorId_TextButtonHoverColor)),
       text_halo_color_(0),
       has_text_halo_(false),
       active_text_shadow_color_(0),
       inactive_text_shadow_color_(0),
       has_shadow_(false),
       shadow_offset_(gfx::Point(1, 1)),
       max_width_(0),
       show_multiple_icon_states_(true),
       is_default_(false),
       multi_line_(false),
@@ skipping 176 matching lines @@
       case ALIGN_CENTER:
         flags |= gfx::Canvas::TEXT_ALIGN_CENTER;
         break;
     }
   }
 
   return flags;
 }
 
 void TextButtonBase::GetExtraParams(
-    ui::NativeTheme::ExtraParams* params) const {
+    gfx::NativeTheme::ExtraParams* params) const {
   params->button.checked = false;
   params->button.indeterminate = false;
   params->button.is_default = false;
   params->button.has_border = false;
   params->button.classic_state = 0;
   params->button.background_color =
-      ui::NativeTheme::instance()->GetSystemColor(
-          ui::NativeTheme::kColorId_TextButtonBackgroundColor);
+      gfx::NativeTheme::instance()->GetSystemColor(
+          gfx::NativeTheme::kColorId_TextButtonBackgroundColor);
 }
 
 gfx::Rect TextButtonBase::GetContentBounds(int extra_width) const {
   gfx::Insets insets = GetInsets();
   int available_width = width() - insets.width();
   int content_width = text_size_.width() + extra_width;
   int content_x = 0;
   switch(alignment_) {
     case ALIGN_LEFT:
       content_x = insets.left();
@@ skipping 121 matching lines @@
   return kViewClassName;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TextButtonBase, NativeThemeDelegate overrides:
 
 gfx::Rect TextButtonBase::GetThemePaintRect() const {
   return GetLocalBounds();
 }
 
-ui::NativeTheme::State TextButtonBase::GetThemeState(
-    ui::NativeTheme::ExtraParams* params) const {
+gfx::NativeTheme::State TextButtonBase::GetThemeState(
+    gfx::NativeTheme::ExtraParams* params) const {
   GetExtraParams(params);
   switch(state()) {
     case BS_DISABLED:
-      return ui::NativeTheme::kDisabled;
+      return gfx::NativeTheme::kDisabled;
     case BS_NORMAL:
-      return ui::NativeTheme::kNormal;
+      return gfx::NativeTheme::kNormal;
     case BS_HOT:
-      return ui::NativeTheme::kHovered;
+      return gfx::NativeTheme::kHovered;
     case BS_PUSHED:
-      return ui::NativeTheme::kPressed;
+      return gfx::NativeTheme::kPressed;
     default:
       NOTREACHED() << "Unknown state: " << state();
-      return ui::NativeTheme::kNormal;
+      return gfx::NativeTheme::kNormal;
   }
 }
 
 const ui::Animation* TextButtonBase::GetThemeAnimation() const {
 #if defined(USE_AURA)
   return hover_animation_.get();
 #elif defined(OS_WIN)
-  return ui::NativeThemeWin::instance()->IsThemingActive()
+  return gfx::NativeThemeWin::instance()->IsThemingActive()
       ? hover_animation_.get() : NULL;
 #else
   return hover_animation_.get();
 #endif
 }
 
-ui::NativeTheme::State TextButtonBase::GetBackgroundThemeState(
-  ui::NativeTheme::ExtraParams* params) const {
+gfx::NativeTheme::State TextButtonBase::GetBackgroundThemeState(
+  gfx::NativeTheme::ExtraParams* params) const {
   GetExtraParams(params);
-  return ui::NativeTheme::kNormal;
+  return gfx::NativeTheme::kNormal;
 }
 
-ui::NativeTheme::State TextButtonBase::GetForegroundThemeState(
-  ui::NativeTheme::ExtraParams* params) const {
+gfx::NativeTheme::State TextButtonBase::GetForegroundThemeState(
+  gfx::NativeTheme::ExtraParams* params) const {
   GetExtraParams(params);
-  return ui::NativeTheme::kHovered;
+  return gfx::NativeTheme::kHovered;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // TextButton
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 TextButton::TextButton(ButtonListener* listener, const string16& text)
     : TextButtonBase(listener, text),
@@ skipping 89 matching lines @@
 }
 
 void TextButton::OnPaintFocusBorder(gfx::Canvas* canvas) {
   if (HasFocus() && (focusable() || IsAccessibilityFocusable())) {
     gfx::Rect rect(GetLocalBounds());
     rect.Inset(kFocusRectInset, kFocusRectInset);
     canvas->DrawFocusRect(rect);
   }
 }
 
-ui::NativeTheme::Part TextButton::GetThemePart() const {
-  return ui::NativeTheme::kPushButton;
+gfx::NativeTheme::Part TextButton::GetThemePart() const {
+  return gfx::NativeTheme::kPushButton;
 }
 
-void TextButton::GetExtraParams(ui::NativeTheme::ExtraParams* params) const {
+void TextButton::GetExtraParams(gfx::NativeTheme::ExtraParams* params) const {
   TextButtonBase::GetExtraParams(params);
   params->button.is_default = is_default_;
 }
 
 gfx::Rect TextButton::GetTextBounds() const {
   int extra_width = 0;
 
   const SkBitmap& icon = GetImageToPaint();
   if (icon.width() > 0)
     extra_width = icon.width() + (text_.empty() ? 0 : icon_text_spacing_);
@@ skipping 67 matching lines @@
     gfx::Rect rect(GetLocalBounds());
     rect.Inset(kFocusRectInset, kFocusRectInset);
     canvas->DrawFocusRect(rect);
   }
 #else
   TextButton::OnPaintFocusBorder(canvas);
 #endif
 }
 
 void NativeTextButton::GetExtraParams(
-    ui::NativeTheme::ExtraParams* params) const {
+    gfx::NativeTheme::ExtraParams* params) const {
   TextButton::GetExtraParams(params);
   params->button.has_border = true;
 }
 
 }  // namespace views