Fix all places where we used the GetWinVersion function...

base/win_util.cc

 // Copyright (c) 2006-2008 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 "base/win_util.h"
 
 #include <map>
 #include <sddl.h>
 
 #include "base/logging.h"
 #include "base/registry.h"
 #include "base/scoped_handle.h"
 #include "base/singleton.h"
 #include "base/string_util.h"
 #include "base/tracked.h"
 
 namespace win_util {
 
 #define SIZEOF_STRUCT_WITH_SPECIFIED_LAST_MEMBER(struct_name, member) \
     offsetof(struct_name, member) + \
     (sizeof static_cast<struct_name*>(NULL)->member)
 #define NONCLIENTMETRICS_SIZE_PRE_VISTA \
     SIZEOF_STRUCT_WITH_SPECIFIED_LAST_MEMBER(NONCLIENTMETRICS, lfMessageFont)
 
 void GetNonClientMetrics(NONCLIENTMETRICS* metrics) {
   DCHECK(metrics);
 
   static const UINT SIZEOF_NONCLIENTMETRICS =
-      (GetWinVersion() == WINVERSION_VISTA) ?
+      (GetWinVersion() >= WINVERSION_VISTA) ?
       sizeof(NONCLIENTMETRICS) : NONCLIENTMETRICS_SIZE_PRE_VISTA;
   metrics->cbSize = SIZEOF_NONCLIENTMETRICS;
   const bool success = !!SystemParametersInfo(SPI_GETNONCLIENTMETRICS,
                                               SIZEOF_NONCLIENTMETRICS, metrics,
                                               0);
   DCHECK(success);
 }
 
 WinVersion GetWinVersion() {
   static bool checked_version = false;
@@ skipping 411 matching lines @@
 
 #ifndef COPY_FILE_COPY_SYMLINK
 #error You must install the Windows 2008 or Vista Software Development Kit and \
 set it as your default include path to build this library. You can grab it by \
 searching for "download windows sdk 2008" in your favorite web search engine.  \
 Also make sure you register the SDK with Visual Studio, by selecting \
 "Integrate Windows SDK with Visual Studio 2005" from the Windows SDK \
 menu (see Start - All Programs - Microsoft Windows SDK - \
 Visual Studio Registration).
 #endif