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

ui/views/controls/combobox/native_combobox_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/combobox/native_combobox_win.h"
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/models/combobox_model.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/font.h"
+#include "ui/gfx/native_theme_win.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/combobox/native_combobox_views.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // Limit how small a combobox can be.
 const int kMinComboboxWidth = 148;
 
 // Add a couple extra pixels to the widths of comboboxes and combobox
@@ skipping 78 matching lines @@
 }
 
 gfx::Size NativeComboboxWin::GetPreferredSize() {
   COMBOBOXINFO cbi = { 0 };
   cbi.cbSize = sizeof(cbi);
   // Note: Don't use CB_GETCOMBOBOXINFO since that crashes on WOW64 systems
   // when you have a global message hook installed.
   GetComboBoxInfo(native_view(), &cbi);
   gfx::Rect rect_item(cbi.rcItem);
   gfx::Rect rect_button(cbi.rcButton);
-  gfx::Size border = ui::NativeThemeWin::instance()->GetThemeBorderSize(
-      ui::NativeThemeWin::MENULIST);
+  gfx::Size border = gfx::NativeThemeWin::instance()->GetThemeBorderSize(
+      gfx::NativeThemeWin::MENULIST);
 
   // The padding value of '3' is the xy offset from the corner of the control
   // to the corner of rcItem.  It does not seem to be queryable from the theme.
   // It is consistent on all versions of Windows from 2K to Vista, and is
   // invariant with respect to the combobox border size.  We could conceivably
   // get this number from rect_item.x, but it seems fragile to depend on
   // position here, inside of the layout code.
   const int kItemOffset = 3;
   int item_to_button_distance = std::max(kItemOffset - border.width(), 0);
 
@@ skipping 84 matching lines @@
 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
     Combobox* combobox) {
 #if defined(USE_AURA)
   return new NativeComboboxViews(combobox);
 #else
   return new NativeComboboxWin(combobox);
 #endif
 }
 
 }  // namespace views