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

views/controls/button/native_button_win.cc

 // 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/button/native_button_win.h"
 
 #include <commctrl.h>
 #include <oleacc.h>
 
 #include "base/logging.h"
 #include "base/scoped_comptr_win.h"
 #include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/button/radio_button.h"
 #include "views/widget/widget.h"
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeButtonWin, public:
 
 NativeButtonWin::NativeButtonWin(NativeButton* native_button)
     : native_button_(native_button),
       button_size_valid_(false) {
   // Associates the actual HWND with the native_button so the native_button is
   // the one considered as having the focus (not the wrapper) when the HWND is
   // focused directly (with a click for example).
   set_focus_view(native_button);
 }
 
 NativeButtonWin::~NativeButtonWin() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeButtonWin, NativeButtonWrapper implementation:
 
 void NativeButtonWin::UpdateLabel() {
   // Show or hide the shield icon of Windows onto this button every time when we
   // update the button text so Windows can lay out the shield icon and the
   // button text correctly.
-  if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA &&
+  if (base::win::GetVersion() >= base::win::VERSION_VISTA &&
       win_util::UserAccountControlIsEnabled()) {
     Button_SetElevationRequiredState(native_view(),
                                      native_button_->need_elevation());
   }
 
   SetWindowText(native_view(), native_button_->label().c_str());
   button_size_valid_ = false;
 }
 
 void NativeButtonWin::UpdateFont() {
@@ skipping 221 matching lines @@
   return new NativeCheckboxWin(checkbox);
 }
 
 // static
 NativeButtonWrapper* NativeButtonWrapper::CreateRadioButtonWrapper(
     RadioButton* radio_button) {
   return new NativeRadioButtonWin(radio_button);
 }
 
 }  // namespace views