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

chrome/browser/web_applications/web_app.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/web_applications/web_app.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include <shlobj.h>
 #endif  // defined(OS_WIN)
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/md5.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/thread.h"
 #include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
+#include "base/win/windows_version.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_plugin_util.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/url_constants.h"
@@ skipping 252 matching lines @@
       chrome::DIR_USER_DESKTOP,
       NULL
     }, {
       shortcut_info_.create_in_applications_menu,
       base::DIR_START_MENU,
       NULL
     }, {
       shortcut_info_.create_in_quick_launch_bar,
       // For Win7, create_in_quick_launch_bar means pinning to taskbar. Use
       // base::PATH_START as a flag for this case.
-      (win_util::GetWinVersion() >= win_util::WINVERSION_WIN7) ?
+      (base::win::GetVersion() >= base::win::VERSION_WIN7) ?
           base::PATH_START : base::DIR_APP_DATA,
-      (win_util::GetWinVersion() >= win_util::WINVERSION_WIN7) ?
+      (base::win::GetVersion() >= base::win::VERSION_WIN7) ?
           NULL : L"Microsoft\\Internet Explorer\\Quick Launch"
     }
   };
 
   // Populate shortcut_paths.
   for (int i = 0; i < arraysize(locations); ++i) {
     if (locations[i].use_this_location) {
       FilePath path;
 
       // Skip the Win7 case.
       if (locations[i].location_id == base::PATH_START)
         continue;
 
       if (!PathService::Get(locations[i].location_id, &path)) {
         NOTREACHED();
         return false;
       }
 
       if (locations[i].sub_dir != NULL)
         path = path.Append(locations[i].sub_dir);
 
       shortcut_paths.push_back(path);
     }
   }
 
   bool pin_to_taskbar =
       shortcut_info_.create_in_quick_launch_bar &&
-      (win_util::GetWinVersion() >= win_util::WINVERSION_WIN7);
+      (base::win::GetVersion() >= base::win::VERSION_WIN7);
 
   // For Win7's pinning support, any shortcut could be used. So we only create
   // the shortcut file when there is no shortcut file will be created. That is,
   // user only selects "Pin to taskbar".
   if (pin_to_taskbar && shortcut_paths.empty()) {
     // Creates the shortcut in web_app_path_ in this case.
     shortcut_paths.push_back(web_app_path_);
   }
 
   if (shortcut_paths.empty()) {
@@ skipping 233 matching lines @@
       chrome::DIR_USER_DESKTOP,
       NULL
     }, {
       shortcut_info_.create_in_applications_menu,
       base::DIR_START_MENU,
       NULL
     }, {
       shortcut_info_.create_in_quick_launch_bar,
       // For Win7, create_in_quick_launch_bar means pinning to taskbar.
       base::DIR_APP_DATA,
-      (win_util::GetWinVersion() >= win_util::WINVERSION_WIN7) ?
+      (base::win::GetVersion() >= base::win::VERSION_WIN7) ?
           L"Microsoft\\Internet Explorer\\Quick Launch\\User Pinned\\TaskBar" :
           L"Microsoft\\Internet Explorer\\Quick Launch"
     }
   };
 
   for (int i = 0; i < arraysize(locations); ++i) {
     locations[i].use_this_location = false;
 
     FilePath path;
     if (!PathService::Get(locations[i].location_id, &path)) {
@@ skipping 166 matching lines @@
 
 void UpdateShortcutForTabContents(TabContents* tab_contents) {
 #if defined(OS_WIN)
   // UpdateShortcutWorker will delete itself when it's done.
   UpdateShortcutWorker* worker = new UpdateShortcutWorker(tab_contents);
   worker->Run();
 #endif  // defined(OS_WIN)
 }
 
 };  // namespace web_app