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

ui/views/examples/native_theme_button_example.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/examples/native_theme_button_example.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/stringprintf.h"
@@ skipping 45 matching lines @@
   set_background(Background::CreateBackgroundPainter(
       false, painter_.get()));
 }
 
 ExampleNativeThemeButton::~ExampleNativeThemeButton() {
 }
 
 std::string ExampleNativeThemeButton::MessWithState() {
   const char* message = NULL;
   switch (GetThemePart()) {
-    case ui::NativeTheme::kPushButton:
+    case gfx::NativeTheme::kPushButton:
       message = "Pressed! count:%d";
       break;
-    case ui::NativeTheme::kRadio:
+    case gfx::NativeTheme::kRadio:
       is_checked_ = !is_checked_;
       message = is_checked_ ? "Checked! count:%d" : "Unchecked! count:%d";
       break;
-    case ui::NativeTheme::kCheckbox:
+    case gfx::NativeTheme::kCheckbox:
       if (is_indeterminate_) {
         is_checked_ = false;
         is_indeterminate_ = false;
       } else if (!is_checked_) {
         is_checked_ = true;
       } else {
         is_checked_ = false;
         is_indeterminate_ = true;
       }
       if (is_checked_)
         message = "Checked! count:%d";
       else if (is_indeterminate_)
         message = "Indeterminate! count:%d";
       else
         message = "Unchecked! count:%d";
       break;
     default:
       NOTREACHED();
   }
 
   return base::StringPrintf(message, ++count_);
 }
 
 void ExampleNativeThemeButton::OnSelectedIndexChanged(Combobox* combobox) {
   SchedulePaint();
 }
 
-ui::NativeTheme::Part ExampleNativeThemeButton::GetThemePart() const {
+gfx::NativeTheme::Part ExampleNativeThemeButton::GetThemePart() const {
   switch (cb_part_->selected_index()) {
     case 0:
-      return ui::NativeTheme::kPushButton;
+      return gfx::NativeTheme::kPushButton;
     case 1:
-      return ui::NativeTheme::kRadio;
+      return gfx::NativeTheme::kRadio;
     case 2:
-      return ui::NativeTheme::kCheckbox;
+      return gfx::NativeTheme::kCheckbox;
     default:
       NOTREACHED();
   }
-  return ui::NativeTheme::kPushButton;
+  return gfx::NativeTheme::kPushButton;
 }
 
 gfx::Rect ExampleNativeThemeButton::GetThemePaintRect() const {
-  ui::NativeTheme::ExtraParams extra;
-  ui::NativeTheme::State state = GetThemeState(&extra);
-  gfx::Size size(ui::NativeTheme::instance()->GetPartSize(GetThemePart(), state,
-                                                          extra));
+  gfx::NativeTheme::ExtraParams extra;
+  gfx::NativeTheme::State state = GetThemeState(&extra);
+  gfx::Size size(gfx::NativeTheme::instance()->GetPartSize(GetThemePart(),
+                                                           state,
+                                                           extra));
   gfx::Rect rect(size);
   rect.set_x(GetMirroredXForRect(rect));
   return rect;
 }
 
-ui::NativeTheme::State ExampleNativeThemeButton::GetThemeState(
-    ui::NativeTheme::ExtraParams* params) const {
+gfx::NativeTheme::State ExampleNativeThemeButton::GetThemeState(
+    gfx::NativeTheme::ExtraParams* params) const {
   GetExtraParams(params);
 
   int selected = cb_state_->selected_index();
   if (selected > 3) {
     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();
     }
   }
 
   switch (selected) {
     case 0:
-      return ui::NativeTheme::kDisabled;
+      return gfx::NativeTheme::kDisabled;
     case 1:
-      return ui::NativeTheme::kNormal;
+      return gfx::NativeTheme::kNormal;
     case 2:
-      return ui::NativeTheme::kHovered;
+      return gfx::NativeTheme::kHovered;
     case 3:
-      return ui::NativeTheme::kPressed;
+      return gfx::NativeTheme::kPressed;
     default:
       NOTREACHED();
   }
-  return ui::NativeTheme::kNormal;
+  return gfx::NativeTheme::kNormal;
 }
 
 void ExampleNativeThemeButton::GetExtraParams(
-    ui::NativeTheme::ExtraParams* params) const {
+    gfx::NativeTheme::ExtraParams* params) const {
 
   params->button.checked = is_checked_;
   params->button.indeterminate = is_indeterminate_;
   params->button.is_default = false;
   params->button.has_border = false;
   params->button.classic_state = 0;
   params->button.background_color = SkColorSetARGB(0, 0, 0, 0);
 }
 
 const ui::Animation* ExampleNativeThemeButton::GetThemeAnimation() const {
   return cb_state_->selected_index() <= 3 ? NULL : hover_animation_.get();
 }
 
-ui::NativeTheme::State ExampleNativeThemeButton::GetBackgroundThemeState(
-    ui::NativeTheme::ExtraParams* params) const {
+gfx::NativeTheme::State ExampleNativeThemeButton::GetBackgroundThemeState(
+    gfx::NativeTheme::ExtraParams* params) const {
   GetExtraParams(params);
-  return ui::NativeTheme::kNormal;
+  return gfx::NativeTheme::kNormal;
 }
 
-ui::NativeTheme::State ExampleNativeThemeButton::GetForegroundThemeState(
-    ui::NativeTheme::ExtraParams* params) const {
+gfx::NativeTheme::State ExampleNativeThemeButton::GetForegroundThemeState(
+    gfx::NativeTheme::ExtraParams* params) const {
   GetExtraParams(params);
-  return ui::NativeTheme::kHovered;
+  return gfx::NativeTheme::kHovered;
 }
 
 gfx::Size ExampleNativeThemeButton::GetPreferredSize() {
   return painter_.get() == NULL ? gfx::Size() : painter_->GetPreferredSize();
 }
 
 void ExampleNativeThemeButton::OnPaintBackground(gfx::Canvas* canvas) {
   // Fill the background with a known colour so that we know where the bounds
   // of the View are.
   canvas->FillRect(GetLocalBounds(), SkColorSetRGB(255, 128, 128));
@@ skipping 54 matching lines @@
   layout->AddPaddingRow(0, 8);
 }
 
 void NativeThemeButtonExample::ButtonPressed(Button* sender,
                                              const Event& event) {
   PrintStatus(button_->MessWithState().c_str());
 }
 
 }  // namespace examples
 }  // namespace views