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

ui/views/controls/textfield/native_textfield_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/textfield/native_textfield_win.h"
 
 #include <algorithm>
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "grit/ui_strings.h"
 #include "skia/ext/skia_utils_win.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
-#include "ui/base/native_theme/native_theme_win.h"
 #include "ui/base/range/range.h"
 #include "ui/base/win/mouse_wheel_util.h"
+#include "ui/gfx/native_theme_win.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/controls/textfield/native_textfield_views.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/metrics.h"
@@ skipping 877 matching lines @@
     else if (contains_mouse_)
       state = EPSHV_HOT;
     else
       state = EPSHV_NORMAL;
     // Vista doesn't appear to have a unique state for readonly.
   }
 
   int classic_state =
       (!textfield_->enabled() || textfield_->read_only()) ? DFCS_INACTIVE : 0;
 
-  ui::NativeThemeWin::instance()->PaintTextField(hdc, part, state,
-                                                 classic_state, &window_rect,
-                                                 bg_color_, false, true);
+  gfx::NativeThemeWin::instance()->PaintTextField(hdc, part, state,
+                                                  classic_state, &window_rect,
+                                                  bg_color_, false, true);
 
   // NOTE: I tried checking the transparent property of the theme and invoking
   // drawParentBackground, but it didn't seem to make a difference.
 
   ReleaseDC(hdc);
 }
 
 void NativeTextfieldWin::OnNonLButtonDown(UINT keys, const CPoint& point) {
   // Interestingly, the edit doesn't seem to cancel triple clicking when the
   // x-buttons (which usually means "thumb buttons") are pressed, so we only
@@ skipping 253 matching lines @@
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
 #if defined(USE_AURA)
   return new NativeTextfieldViews(field);
 #else
   return new NativeTextfieldWin(field);
 #endif
 }
 
 }  // namespace views