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

ui/views/controls/tabbed_pane/native_tabbed_pane_win.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/tabbed_pane/native_tabbed_pane_win.h"
 
 #include <vssym32.h>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
-#include "ui/base/native_theme/native_theme_win.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
+#include "ui/gfx/native_theme_win.h"
 #include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #include "ui/views/controls/tabbed_pane/tabbed_pane_listener.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 // A background object that paints the tab panel background which may be
 // rendered by the system visual styles system.
 class TabBackground : public Background {
  public:
   explicit TabBackground() {
     // TMT_FILLCOLORHINT returns a color value that supposedly
     // approximates the texture drawn by PaintTabPanelBackground.
     SkColor tab_page_color =
-        ui::NativeThemeWin::instance()->GetThemeColorWithDefault(
-            ui::NativeThemeWin::TAB, TABP_BODY, 0, TMT_FILLCOLORHINT,
+        gfx::NativeThemeWin::instance()->GetThemeColorWithDefault(
+            gfx::NativeThemeWin::TAB, TABP_BODY, 0, TMT_FILLCOLORHINT,
             COLOR_3DFACE);
     SetNativeControlColor(tab_page_color);
   }
   virtual ~TabBackground() {}
 
   virtual void Paint(gfx::Canvas* canvas, View* view) const {
     gfx::Rect r(0, 0, view->width(), view->height());
-    ui::NativeTheme::ExtraParams extra;
-    ui::NativeTheme::instance()->Paint(
-        canvas->sk_canvas(), ui::NativeTheme::kTabPanelBackground,
-        ui::NativeTheme::kNormal, r, extra);
+    gfx::NativeTheme::ExtraParams extra;
+    gfx::NativeTheme::instance()->Paint(
+        canvas->sk_canvas(), gfx::NativeTheme::kTabPanelBackground,
+        gfx::NativeTheme::kNormal, r, extra);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TabBackground);
 };
 
 // Custom layout manager that takes care of sizing and displaying the tab pages.
 class TabLayout : public LayoutManager {
  public:
   TabLayout() {}
@@ skipping 342 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabbedPaneWrapper, public:
 
 // static
 NativeTabbedPaneWrapper* NativeTabbedPaneWrapper::CreateNativeWrapper(
     TabbedPane* tabbed_pane) {
   return new NativeTabbedPaneWin(tabbed_pane);
 }
 
 }  // namespace views