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

chrome/browser/jumplist_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/jumplist_win.h"
 
 #include <windows.h>
 #include <shobjidl.h>
 #include <propkey.h>
 #include <propvarutil.h>
 
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_comptr_win.h"
 #include "base/string_util.h"
 #include "base/thread.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/favicon_service.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 348 matching lines @@
 // the Chromium JumpList, such as:
 // * Creating an ICustomDestinationList instance;
 // * Updating the categories of the ICustomDestinationList instance, and;
 // * Sending it to Taskbar of Windows 7.
 bool UpdateJumpList(const wchar_t* app_id,
                     const ShellLinkItemList& most_visited_pages,
                     const ShellLinkItemList& recently_closed_pages) {
   // JumpList is implemented only on Windows 7 or later.
   // So, we should return now when this function is called on earlier versions
   // of Windows.
-  if (win_util::GetWinVersion() < win_util::WINVERSION_WIN7)
+  if (base::win::GetVersion() < base::win::VERSION_WIN7)
     return true;
 
   // Create an ICustomDestinationList object and attach it to our application.
   ScopedComPtr<ICustomDestinationList> destination_list;
   HRESULT result = destination_list.CreateInstance(CLSID_DestinationList, NULL,
                                                    CLSCTX_INPROC_SERVER);
   if (FAILED(result))
     return false;
 
   // Set the App ID for this JumpList.
@@ skipping 168 matching lines @@
 
 JumpList::JumpList() : profile_(NULL) {
 }
 
 JumpList::~JumpList() {
   RemoveObserver();
 }
 
 // static
 bool JumpList::Enabled() {
-  return (win_util::GetWinVersion() >= win_util::WINVERSION_WIN7 &&
+  return (base::win::GetVersion() >= base::win::VERSION_WIN7 &&
           !CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kDisableCustomJumpList));
 }
 
 bool JumpList::AddObserver(Profile* profile) {
   // To update JumpList when a tab is added or removed, we add this object to
   // the observer list of the TabRestoreService class.
   // When we add this object to the observer list, we save the pointer to this
   // TabRestoreService object. This pointer is used when we remove this object
   // from the observer list.
-  if (win_util::GetWinVersion() < win_util::WINVERSION_WIN7 || !profile)
+  if (base::win::GetVersion() < base::win::VERSION_WIN7 || !profile)
     return false;
 
   TabRestoreService* tab_restore_service = profile->GetTabRestoreService();
   if (!tab_restore_service)
     return false;
 
   app_id_ = ShellIntegration::GetChromiumAppId(profile->GetPath());
   icon_dir_ = profile->GetPath().Append(chrome::kJumpListIconDirname);
   profile_ = profile;
   tab_restore_service->AddObserver(this);
@@ skipping 168 matching lines @@
   // the file thread.
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       new JumpListUpdateTask(app_id_.c_str(), icon_dir_, most_visited_pages_,
                              recently_closed_pages_));
 
   // Delete all items in these lists since we don't need these lists any longer.
   most_visited_pages_.clear();
   recently_closed_pages_.clear();
 }