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

app/win_util.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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 "app/win_util.h"
 
 #include <commdlg.h>
 #include <dwmapi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/native_library.h"
 #include "base/scoped_comptr_win.h"
 #include "base/scoped_handle.h"
 #include "base/scoped_handle_win.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "gfx/codec/png_codec.h"
 #include "gfx/gdi_util.h"
 
 // Ensure that we pick up this link library.
 #pragma comment(lib, "dwmapi.lib")
 
 namespace win_util {
 
 const int kAutoHideTaskbarThicknessPx = 2;
 
@@ skipping 55 matching lines @@
 
 bool IsDrag(const POINT& origin, const POINT& current) {
   // The CXDRAG and CYDRAG system metrics describe the width and height of a
   // rectangle around the origin position, inside of which motion is not
   // considered a drag.
   return (abs(current.x - origin.x) > (GetSystemMetrics(SM_CXDRAG) / 2)) ||
          (abs(current.y - origin.y) > (GetSystemMetrics(SM_CYDRAG) / 2));
 }
 
 bool ShouldUseVistaFrame() {
-  if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA)
+  if (base::win::GetVersion() < base::win::VERSION_VISTA)
     return false;
   // If composition is not enabled, we behave like on XP.
   BOOL f;
   DwmIsCompositionEnabled(&f);
   return !!f;
 }
 
 // Open an item via a shell execute command. Error code checking and casting
 // explanation: http://msdn2.microsoft.com/en-us/library/ms647732.aspx
 bool OpenItemViaShell(const FilePath& full_path) {
@@ skipping 425 matching lines @@
 gfx::Font GetWindowTitleFont() {
   NONCLIENTMETRICS ncm;
   win_util::GetNonClientMetrics(&ncm);
   l10n_util::AdjustUIFont(&(ncm.lfCaptionFont));
   ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont)));
   return gfx::Font(caption_font);
 }
 
 void SetAppIdForWindow(const std::wstring& app_id, HWND hwnd) {
   // This functionality is only available on Win7+.
-  if (win_util::GetWinVersion() < win_util::WINVERSION_WIN7)
+  if (base::win::GetVersion() < base::win::VERSION_WIN7)
     return;
 
   // Load Shell32.dll into memory.
   // TODO(brg): Remove this mechanism when the Win7 SDK is available in trunk.
   std::wstring shell32_filename(kShell32);
   FilePath shell32_filepath(shell32_filename);
   base::NativeLibrary shell32_library = base::LoadNativeLibrary(
       shell32_filepath);
 
   if (!shell32_library)
@@ skipping 16 matching lines @@
       hwnd, __uuidof(*pps), reinterpret_cast<void**>(pps.Receive()));
   if (S_OK == result) {
     SetAppIdForPropertyStore(pps, app_id.c_str());
   }
 
   // Cleanup.
   base::UnloadNativeLibrary(shell32_library);
 }
 
 }  // namespace win_util