Move windows version-related stuff out of base/win_util and into base/win/windows_version. Many files now only need to include this instead of all of win_util.

Remove a bunch of unused code from base/win_util. There was a surprising amount.

Replace the AppUserModel property key with the one from the SDK now that we use the Win7 SDK. Move GetLogonSessionOnlyDACL from win_util to ipc since it's only used in that one place.

TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3823002

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

5 files changed, 15 insertions, 15 deletions

diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index 9329215..7b674f2 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -20,7 +20,7 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/setup/install.h"
 #include "chrome/installer/setup/setup_constants.h"
@@ -677,7 +677,7 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
     return exit_code;
 
   if (system_install && !IsUserAnAdmin()) {
-    if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA &&
+    if (base::win::GetVersion() >= base::win::VERSION_VISTA &&
         !parsed_command_line.HasSwitch(installer_util::switches::kRunAsAdmin)) {
       std::wstring exe = parsed_command_line.GetProgram().value();
       std::wstring params(command_line);
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 4822aa1..9ab8aab 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -12,7 +12,7 @@
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths_internal.h"
@@ -468,7 +468,7 @@ installer_util::InstallStatus installer_setup::UninstallChrome(
     if (remove_all &&
         (!suffix.empty() || CurrentUserHasDefaultBrowser(system_uninstall)) &&
         !::IsUserAnAdmin() &&
-        (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) &&
+        (base::win::GetVersion() >= base::win::VERSION_VISTA) &&
         !cmd_line.HasSwitch(installer_util::switches::kRunAsAdmin)) {
       std::wstring exe = cmd_line.GetProgram().value();
       std::wstring params(cmd_params);
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
index 9715e71..c0fc09dc 100644
--- a/chrome/installer/util/google_chrome_distribution.cc
+++ b/chrome/installer/util/google_chrome_distribution.cc
@@ -21,7 +21,7 @@
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/common/pref_names.h"
@@ -228,7 +228,7 @@ bool RelaunchSetupAsConsoleUser(const std::wstring& flag) {
       WideToASCII(installer_util::switches::kToastResultsKey),
       base::IntToString(key));
 
-  if (win_util::GetWinVersion() > win_util::WINVERSION_XP) {
+  if (base::win::GetVersion() > base::win::VERSION_XP) {
     // Make sure that in Vista and Above we have the proper DACLs so
     // the interactive user can launch it.
     if (!FixDACLsForExecute(setup_exe.ToWStringHack().c_str()))
diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc
index e99f387..a0dfad1 100644
--- a/chrome/installer/util/install_util.cc
+++ b/chrome/installer/util/install_util.cc
@@ -20,7 +20,7 @@
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/values.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
@@ -80,14 +80,14 @@ installer::Version* InstallUtil::GetChromeVersion(bool system_install) {
 
 bool InstallUtil::IsOSSupported() {
   int major, minor;
-  win_util::WinVersion version = win_util::GetWinVersion();
-  win_util::GetServicePackLevel(&major, &minor);
+  base::win::Version version = base::win::GetVersion();
+  base::win::GetServicePackLevel(&major, &minor);
 
   // We do not support Win2K or older, or XP without service pack 2.
   LOG(INFO) << "Windows Version: " << version
             << ", Service Pack: " << major << "." << minor;
-  if ((version > win_util::WINVERSION_XP) ||
-      (version == win_util::WINVERSION_XP && major >= 2)) {
+  if ((version > base::win::VERSION_XP) ||
+      (version == base::win::VERSION_XP && major >= 2)) {
     return true;
   }
   return false;
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index b3cf02b..257a78f 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc
@@ -24,7 +24,7 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/browser_distribution.h"
@@ -551,7 +551,7 @@ bool ShellUtil::GetQuickLaunchPath(bool system_level, std::wstring* path) {
     if ((p == NULL) || ((p)(qlaunch, &size) != TRUE))
       return false;
     *path = qlaunch;
-    if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) {
+    if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
       file_util::AppendToPath(path, L"AppData\\Roaming");
     } else {
       file_util::AppendToPath(path, L"Application Data");
@@ -618,7 +618,7 @@ bool ShellUtil::MakeChromeDefault(int shell_change,
   bool ret = true;
   // First use the new "recommended" way on Vista to make Chrome default
   // browser.
-  if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) {
+  if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
     LOG(INFO) << "Registering Chrome as default browser on Vista.";
     IApplicationAssociationRegistration* pAAR;
     HRESULT hr = CoCreateInstance(CLSID_ApplicationAssociationRegistration,
@@ -699,7 +699,7 @@ bool ShellUtil::RegisterChromeBrowser(const std::wstring& chrome_exe,
 
   // If user is not an admin and OS is Vista, try to elevate and register.
   if (elevate_if_not_admin &&
-      win_util::GetWinVersion() >= win_util::WINVERSION_VISTA &&
+      base::win::GetVersion() >= base::win::VERSION_VISTA &&
       ElevateAndRegisterChrome(chrome_exe, suffix))
     return true;