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

ui/views/controls/menu/menu_item_view_win.cc

Index: ui/views/controls/menu/menu_item_view_win.cc
===================================================================
--- ui/views/controls/menu/menu_item_view_win.cc	(revision 137002)
+++ ui/views/controls/menu/menu_item_view_win.cc	(working copy)
@@ -8,12 +8,12 @@
 #include <Vssym32.h>
 
 #include "grit/ui_strings.h"
-#include "ui/base/native_theme/native_theme_win.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/native_theme_win.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/submenu_view.h"
 
-using ui::NativeTheme;
+using gfx::NativeTheme;
 
 namespace views {
 
@@ -79,8 +79,8 @@
   // Render the foreground.
   // Menu color is specific to Vista, fallback to classic colors if can't
   // get color.
-  SkColor fg_color = ui::NativeThemeWin::instance()->GetThemeColorWithDefault(
-      ui::NativeThemeWin::MENU, MENU_POPUPITEM, state, TMT_TEXTCOLOR,
+  SkColor fg_color = gfx::NativeThemeWin::instance()->GetThemeColorWithDefault(
+      gfx::NativeThemeWin::MENU, MENU_POPUPITEM, state, TMT_TEXTCOLOR,
       default_sys_color);
   const gfx::Font& font = GetFont();
   int accel_width = parent_menu_item_->GetSubmenu()->max_accelerator_width();
@@ -124,11 +124,11 @@
     // If our sub menus open from right to left (which is the case when the
     // locale is RTL) then we should make sure the menu arrow points to the
     // right direction.
-    ui::NativeTheme::ExtraParams extra;
+    gfx::NativeTheme::ExtraParams extra;
     extra.menu_arrow.pointing_right = !base::i18n::IsRTL();
     extra.menu_arrow.is_selected = render_selection;
-    ui::NativeTheme::instance()->Paint(canvas->sk_canvas(),
-        ui::NativeTheme::kMenuPopupArrow, control_state, arrow_bounds, extra);
+    gfx::NativeTheme::instance()->Paint(canvas->sk_canvas(),
+        gfx::NativeTheme::kMenuPopupArrow, control_state, arrow_bounds, extra);
   }
 }