Move windows version-related stuff out of base/win_util and into base/win/win...

views/controls/menu/menu_host_win.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "views/controls/menu/menu_host_win.h"
 
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_host_root_view.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/submenu_view.h"
 
 namespace views {
 
 // static
 MenuHost* MenuHost::Create(SubmenuView* submenu_view) {
   return new MenuHostWin(submenu_view);
 }
 
 MenuHostWin::MenuHostWin(SubmenuView* submenu)
     : destroying_(false),
       submenu_(submenu),
       owns_capture_(false) {
   set_window_style(WS_POPUP);
   set_initial_class_style(
-      (win_util::GetWinVersion() < win_util::WINVERSION_XP) ?
+      (base::win::GetVersion() < base::win::VERSION_XP) ?
       0 : CS_DROPSHADOW);
   is_mouse_down_ =
       ((GetKeyState(VK_LBUTTON) & 0x80) ||
        (GetKeyState(VK_RBUTTON) & 0x80) ||
        (GetKeyState(VK_MBUTTON) & 0x80) ||
        (GetKeyState(VK_XBUTTON1) & 0x80) ||
        (GetKeyState(VK_XBUTTON2) & 0x80));
   // Mouse clicks shouldn't give us focus.
   set_window_ex_style(WS_EX_TOPMOST | WS_EX_NOACTIVATE);
 }
@@ skipping 84 matching lines @@
 void MenuHostWin::DoCapture() {
   owns_capture_ = true;
   SetCapture();
   has_capture_ = true;
 #ifdef DEBUG_MENU
   DLOG(INFO) << "Doing capture";
 #endif
 }
 
 }  // namespace views