Use GetVersion for Windows run-time version checks in preference to OperatingSystemVersionNumbers

chrome/renderer/localized_error.cc

 // Copyright (c) 2011 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/renderer/localized_error.h"
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
-#include "base/sys_info.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "webkit/glue/webkit_glue.h"
 
+#if defined(OS_WIN)
+#include "base/win/windows_version.h"
+#endif
+
 using WebKit::WebURLError;
 
 namespace {
 
 static const char kRedirectLoopLearnMoreUrl[] =
     "https://www.google.com/support/chrome/bin/answer.py?answer=95626";
 static const char kWeakDHKeyLearnMoreUrl[] =
     "http://sites.google.com/a/chromium.org/dev/err_ssl_weak_server_ephemeral_dh_key";
 static const char kESETLearnMoreUrl[] =
     "http://kb.eset.com/esetkb/index?page=content&id=SOLN2588";
@@ skipping 401 matching lines @@
 
   // Platform specific instructions for diagnosing network issues on OSX and
   // Windows.
 #if defined(OS_MACOSX) || defined(OS_WIN)
   if (error_domain == net::kErrorDomain &&
       error_code == net::ERR_INTERNET_DISCONNECTED) {
     int platform_string_id =
         IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED_PLATFORM;
 #if defined(OS_WIN)
     // Different versions of Windows have different instructions.
-    int32 major_version, minor_version, bugfix_version;
-    base::SysInfo::OperatingSystemVersionNumbers(
-        &major_version, &minor_version, &bugfix_version);
-    if (major_version < 6) {
+    base::win::Version windows_version = base::win::GetVersion();
+    if (windows_version < base::win::VERSION_VISTA) {
       // XP, XP64, and Server 2003.
       platform_string_id =
           IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED_PLATFORM_XP;
-    } else if (major_version == 6 && minor_version == 0) {
+    } else if (windows_version == base::win::VERSION_VISTA) {
       // Vista
       platform_string_id =
           IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED_PLATFORM_VISTA;
     }

[wtc, 2011/06/14 18:35:30]

It seems that we should also have a custom string for Windows 7.

[Mark Mentovai, 2011/06/14 19:22:07]

wtc wrote:
This confused me too. Windows 7 uses
IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED_PLATFORM, which is the initial
value of platform_string_id from line 444. The relevant definition in
chrome/app/generated_resources.grd is:

        <message name="IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED_PLATFORM"
desc="Summary (platform dependent section) in the error page when the network
connection failed.  Describes how to get to the network Diagnostics screen under
Windows 7 and later.">
          Go to
          <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>
          Start &gt; Control Panel &gt; Network and Internet &gt; Network and
Sharing Center &gt; Troubleshoot Problems (at the bottom) &gt; Internet
Connections.
          <ph name="END_BOLD">&lt;/strong&gt;</ph>
        </message>

This string will also be used for Windows Server 2008. I’m not sure if that’s
correct or if that release should use the Vista message or something else. I
also have no way to check this, so I left the Vista message for Vista and Vista
only, which is what the existing code did.

 #endif  // defined(OS_WIN)
     // Lead with the general error description, and suffix with the platform
     // dependent portion of the summary section.
     summary->SetString("msg",
         l10n_util::GetStringFUTF16(
             IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED_INSTRUCTIONS_TEMPLATE,
             l10n_util::GetStringUTF16(options.summary_resource_id),
             l10n_util::GetStringUTF16(platform_string_id)));
   }
 #endif  // defined(OS_MACOSX) || defined(OS_WIN)
@@ skipping 145 matching lines @@
                                        failed_url.c_str()));
 
   error_strings->SetString("title", app->name());
   error_strings->SetString("icon",
       app->GetIconURL(Extension::EXTENSION_ICON_LARGE,
                       ExtensionIconSet::MATCH_SMALLER).spec());
   error_strings->SetString("name", app->name());
   error_strings->SetString("msg",
       l10n_util::GetStringUTF16(IDS_ERRORPAGES_APP_WARNING));
 }