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

chrome/browser/aeropeek_manager.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/aeropeek_manager.h"
 
 #include <dwmapi.h>
 #include <shobjidl.h>
 
 #include "app/win_util.h"
 #include "base/command_line.h"
 #include "base/scoped_comptr_win.h"
 #include "base/scoped_handle_win.h"
 #include "base/scoped_native_library.h"
 #include "base/waitable_event.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "chrome/browser/app_icon_win.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/renderer_host/backing_store.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/tab_contents/thumbnail_generator.h"
@@ skipping 995 matching lines @@
 
 // static
 bool AeroPeekManager::Enabled() {
   // We enable our custom AeroPeek only when:
   // * Chrome is running on Windows 7 and Aero is enabled,
   // * Chrome is not launched in application mode, and
   // * Chrome is launched with the "--enable-aero-peek-tabs" option.
   // TODO(hbono): Bug 37957 <http://crbug.com/37957>: find solutions that avoid
   // flooding users with tab thumbnails.
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
-  return win_util::GetWinVersion() >= win_util::WINVERSION_WIN7 &&
+  return base::win::GetVersion() >= base::win::VERSION_WIN7 &&
       win_util::ShouldUseVistaFrame() &&
       !command_line->HasSwitch(switches::kApp) &&
       command_line->HasSwitch(switches::kEnableAeroPeekTabs);
 }
 
 void AeroPeekManager::DeleteAeroPeekWindow(int tab_id) {
   // This function does NOT call AeroPeekWindow::Destroy() before deleting
   // the AeroPeekWindow instance.
   for (std::list<AeroPeekWindow*>::iterator i = tab_list_.begin();
        i != tab_list_.end(); ++i) {
@@ skipping 180 matching lines @@
   // This code is just copied from "thumbnail_generator.cc".
   skia::PlatformCanvas canvas;
   if (!backing_store->CopyFromBackingStore(gfx::Rect(backing_store->size()),
                                            &canvas))
     return false;
 
   const SkBitmap& bitmap = canvas.getTopPlatformDevice().accessBitmap(false);
   bitmap.copyTo(preview, SkBitmap::kARGB_8888_Config);
   return true;
 }