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

chrome/browser/shell_integration_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 "chrome/browser/shell_integration.h"
 
 #include <windows.h>
+#include <shobjidl.h>
+#include <propkey.h>
 #include <propvarutil.h>
-#include <shlobj.h>
-#include <shobjidl.h>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/registry.h"
 #include "base/scoped_comptr_win.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/create_reg_key_work_item.h"
 #include "chrome/installer/util/set_reg_value_work_item.h"
 #include "chrome/installer/util/shell_util.h"
@@ skipping 210 matching lines @@
   DCHECK(app_id);
 
   app_id->clear();
 
   ScopedComPtr<IPropertyStore> property_store;
   if (FAILED(property_store.QueryFrom(shell_link)))
     return false;
 
   PROPVARIANT appid_value;
   PropVariantInit(&appid_value);
-  if (FAILED(property_store->GetValue(win_util::kPKEYAppUserModelID,
+  if (FAILED(property_store->GetValue(PKEY_AppUserModel_ID,
                                       &appid_value)))
     return false;
 
   if (appid_value.vt == VT_LPWSTR ||
       appid_value.vt == VT_BSTR)
     app_id->assign(appid_value.pwszVal);
 
   PropVariantClear(&appid_value);
   return true;
 }
@@ skipping 30 matching lines @@
   // type handlers and icons as having changed the default browser status,
   // since the user may have changed their shell settings to cause HTML files
   // to open with a text editor for example. We also don't want to aggressively
   // claim FTP, since the user may have a separate FTP client. It is an open
   // question as to how to "heal" these settings. Perhaps the user should just
   // re-run the installer or run with the --set-default-browser command line
   // flag. There is doubtless some other key we can hook into to cause "Repair"
   // to show up in Add/Remove programs for us.
   const std::wstring kChromeProtocols[] = {L"http", L"https"};
 
-  if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) {
+  if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
     IApplicationAssociationRegistration* pAAR;
     HRESULT hr = CoCreateInstance(CLSID_ApplicationAssociationRegistration,
         NULL, CLSCTX_INPROC, __uuidof(IApplicationAssociationRegistration),
         (void**)&pAAR);
     if (!SUCCEEDED(hr))
       return NOT_DEFAULT_BROWSER;
 
     BrowserDistribution* dist = BrowserDistribution::GetDistribution();
     std::wstring app_name = dist->GetApplicationName();
     // If a user specific default browser entry exists, we check for that
@@ skipping 47 matching lines @@
 // registry on XP and Vista:
 // - HKCR\http\shell\open\command (XP)
 // - HKCU\Software\Microsoft\Windows\Shell\Associations\UrlAssociations\
 //   http\UserChoice (Vista)
 // This method checks if Firefox is defualt browser by checking these
 // locations and returns true if Firefox traces are found there. In case of
 // error (or if Firefox is not found)it returns the default value which
 // is false.
 bool ShellIntegration::IsFirefoxDefaultBrowser() {
   bool ff_default = false;
-  if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) {
+  if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
     std::wstring app_cmd;
     RegKey key(HKEY_CURRENT_USER, ShellUtil::kRegVistaUrlPrefs, KEY_READ);
     if (key.Valid() && key.ReadValue(L"Progid", &app_cmd) &&
         app_cmd == L"FirefoxURL")
       ff_default = true;
   } else {
     std::wstring key_path(L"http");
     key_path.append(ShellUtil::kRegShellOpen);
     RegKey key(HKEY_CLASSES_ROOT, key_path.c_str(), KEY_READ);
     std::wstring app_cmd;
@@ skipping 18 matching lines @@
   DCHECK(app_id.length() < 128);
   return app_id;
 }
 
 std::wstring ShellIntegration::GetChromiumAppId(const FilePath& profile_path) {
   return GetAppId(BrowserDistribution::GetDistribution()->GetBrowserAppId(),
                   profile_path);
 }
 
 void ShellIntegration::MigrateChromiumShortcuts() {
-  if (win_util::GetWinVersion() < win_util::WINVERSION_WIN7)
+  if (base::win::GetVersion() < base::win::VERSION_WIN7)
     return;
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE, new MigrateChromiumShortcutsTask());
 }