Move base/win_util to the base/win directory and use the base::win namespace.

Fix up includes, many files including base/win_util don't actually need it.

TEST=it compiles
BUG=none

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70341 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 13 insertions, 13 deletions

diff --git a/views/controls/button/native_button_win.cc b/views/controls/button/native_button_win.cc
index 71434e0..f0b1b36 100644
--- a/views/controls/button/native_button_win.cc
+++ b/views/controls/button/native_button_win.cc
@@ -9,7 +9,7 @@
 
 #include "base/logging.h"
 #include "base/win/scoped_comptr.h"
-#include "base/win_util.h"
+#include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/button/native_button.h"
@@ -41,7 +41,7 @@ void NativeButtonWin::UpdateLabel() {
   // update the button text so Windows can lay out the shield icon and the
   // button text correctly.
   if (base::win::GetVersion() >= base::win::VERSION_VISTA &&
-      win_util::UserAccountControlIsEnabled()) {
+      base::win::UserAccountControlIsEnabled()) {
     Button_SetElevationRequiredState(native_view(),
                                      native_button_->need_elevation());
   }
diff --git a/views/controls/menu/menu_config_win.cc b/views/controls/menu/menu_config_win.cc
index 35ab9e2..3882cb4 100644
--- a/views/controls/menu/menu_config_win.cc
+++ b/views/controls/menu/menu_config_win.cc
@@ -10,7 +10,7 @@
 
 #include "app/l10n_util_win.h"
 #include "base/logging.h"
-#include "base/win_util.h"
+#include "base/win/win_util.h"
 #include "gfx/native_theme_win.h"
 
 using gfx::NativeTheme;
@@ -26,7 +26,7 @@ MenuConfig* MenuConfig::Create() {
       COLOR_MENUTEXT);
 
   NONCLIENTMETRICS metrics;
-  win_util::GetNonClientMetrics(&metrics);
+  base::win::GetNonClientMetrics(&metrics);
   l10n_util::AdjustUIFont(&(metrics.lfMenuFont));
   HFONT font = CreateFontIndirect(&metrics.lfMenuFont);
   DLOG_ASSERT(font);
diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc
index e0bd038..cfec12c 100644
--- a/views/controls/menu/menu_item_view.cc
+++ b/views/controls/menu/menu_item_view.cc
@@ -17,7 +17,7 @@
 #include "views/controls/menu/submenu_view.h"
 
 #if defined(OS_WIN)
-#include "base/win_util.h"
+#include "base/win/win_util.h"
 #endif
 
 namespace views {
@@ -162,7 +162,7 @@ void MenuItemView::RunMenuAt(gfx::NativeWindow parent,
   // We don't currently need this on gtk as showing the menu gives focus to the
   // button first.
   if (!show_mnemonics)
-    show_mnemonics = win_util::IsAltPressed();
+    show_mnemonics = base::win::IsAltPressed();
 #endif
   PrepareForRun(has_mnemonics, show_mnemonics);
   int mouse_event_flags;
diff --git a/views/controls/textfield/textfield.cc b/views/controls/textfield/textfield.cc
index e92794d..68c0f1c 100644
--- a/views/controls/textfield/textfield.cc
+++ b/views/controls/textfield/textfield.cc
@@ -22,7 +22,7 @@
 #include "app/keyboard_code_conversion_gtk.h"
 #elif defined(OS_WIN)
 #include "app/win_util.h"
-#include "base/win_util.h"
+#include "base/win/win_util.h"
 // TODO(beng): this should be removed when the OS_WIN hack from
 // ViewHierarchyChanged is removed.
 #include "views/controls/textfield/native_textfield_win.h"
@@ -364,11 +364,11 @@ app::KeyboardCode Textfield::Keystroke::GetKeyboardCode() const {
 
 #if defined(OS_WIN)
 bool Textfield::Keystroke::IsControlHeld() const {
-  return win_util::IsCtrlPressed();
+  return base::win::IsCtrlPressed();
 }
 
 bool Textfield::Keystroke::IsShiftHeld() const {
-  return win_util::IsShiftPressed();
+  return base::win::IsShiftPressed();
 }
 #else
 bool Textfield::Keystroke::IsControlHeld() const {
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index 5fe2ef9..746330d 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -14,7 +14,7 @@
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
-#include "base/win_util.h"
+#include "base/win/win_util.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/canvas_skia_paint.h"
 #include "gfx/favicon_size.h"
@@ -463,9 +463,9 @@ bool TreeView::OnKeyDown(app::KeyboardCode virtual_key_code) {
     Widget* widget = GetWidget();
     DCHECK(widget);
     Accelerator accelerator(Accelerator(virtual_key_code,
-                                        win_util::IsShiftPressed(),
-                                        win_util::IsCtrlPressed(),
-                                        win_util::IsAltPressed()));
+                                        base::win::IsShiftPressed(),
+                                        base::win::IsCtrlPressed(),
+                                        base::win::IsAltPressed()));
     GetFocusManager()->ProcessAccelerator(accelerator);
     return true;
   }