Merge 146054 - Bring back VERSION_SERVER_2003 to distinguish Server 2003 and XP Pro x64 from regula…

chrome/browser/ui/webui/flash_ui.cc

 // Copyright (c) 2012 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/ui/webui/flash_ui.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 226 matching lines @@
   AddPair(list,
           l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
           version_info.Version() + " (" +
           chrome::VersionInfo::GetVersionStringModifier() + ")");
 
   // OS version information.
   std::string os_label = version_info.OSType();
 #if defined(OS_WIN)
   base::win::OSInfo* os = base::win::OSInfo::GetInstance();
   switch (os->version()) {
-    case base::win::VERSION_XP:
-      os_label += " XP or Server 2003 or XP Pro 64 bit";
+    case base::win::VERSION_XP: os_label += " XP"; break;
+    case base::win::VERSION_SERVER_2003:
+      os_label += " Server 2003 or XP Pro 64 bit";
       break;
     case base::win::VERSION_VISTA: os_label += " Vista or Server 2008"; break;
     case base::win::VERSION_WIN7: os_label += " 7 or Server 2008 R2"; break;
     case base::win::VERSION_WIN8: os_label += " 8 or Server 2012"; break;
     default:  os_label += " UNKNOWN"; break;
   }
   os_label += " SP" + base::IntToString(os->service_pack().major);
   if (os->service_pack().minor > 0)
     os_label += "." + base::IntToString(os->service_pack().minor);
   if (os->architecture() == base::win::OSInfo::X64_ARCHITECTURE)
@@ skipping 116 matching lines @@
   // Set up the about:flash source.
   Profile* profile = Profile::FromWebUI(web_ui);
   ChromeURLDataManager::AddDataSource(profile, CreateFlashUIHTMLSource());
 }
 
 // static
 base::RefCountedMemory* FlashUI::GetFaviconResourceBytes() {
   // Use the default icon for now.
   return NULL;
 }