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

chrome/browser/views/about_chrome_view.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 "chrome/browser/views/about_chrome_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "base/win/windows_version.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/views/accessible_view_helper.h"
 #include "chrome/browser/views/window.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
@@ skipping 490 matching lines @@
       parent->AddChildView(&timeout_indicator_);
       timeout_indicator_.SetVisible(false);
 
 #if defined(OS_WIN)
       // On-demand updates for Chrome don't work in Vista RTM when UAC is turned
       // off. So, in this case we just want the About box to not mention
       // on-demand updates. Silent updates (in the background) should still
       // work as before - enabling UAC or installing the latest service pack
       // for Vista is another option.
       int service_pack_major = 0, service_pack_minor = 0;
-      win_util::GetServicePackLevel(&service_pack_major, &service_pack_minor);
+      base::win::GetServicePackLevel(&service_pack_major, &service_pack_minor);
       if (win_util::UserAccountControlIsEnabled() ||
-          win_util::GetWinVersion() == win_util::WINVERSION_XP ||
-          (win_util::GetWinVersion() == win_util::WINVERSION_VISTA &&
+          base::win::GetVersion() == base::win::VERSION_XP ||
+          (base::win::GetVersion() == base::win::VERSION_VISTA &&
            service_pack_major >= 1) ||
-          win_util::GetWinVersion() > win_util::WINVERSION_VISTA) {
+          base::win::GetVersion() > base::win::VERSION_VISTA) {
         UpdateStatus(UPGRADE_CHECK_STARTED, GOOGLE_UPDATE_NO_ERROR);
         // CheckForUpdate(false, ...) means don't upgrade yet.
         google_updater_->CheckForUpdate(false, window());
       }
 #elif defined(OS_CHROMEOS)
       UpdateStatus(UPGRADE_CHECK_STARTED, GOOGLE_UPDATE_NO_ERROR);
       // CheckForUpdate(false, ...) means don't upgrade yet.
       google_updater_->CheckForUpdate(false, window());
 #endif
     } else {
@@ skipping 266 matching lines @@
   View* parent = GetParent();
   parent->Layout();
 
   // Check button may have appeared/disappeared. We cannot call this during
   // ViewHierarchyChanged because the |window()| pointer hasn't been set yet.
   if (window())
     GetDialogClientView()->UpdateDialogButtons();
 }
 
 #endif