OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/webui/flash_ui.h" | 5 #include "chrome/browser/ui/webui/flash_ui.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
237 AddPair(list, | 237 AddPair(list, |
238 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), | 238 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), |
239 version_info.Version() + " (" + | 239 version_info.Version() + " (" + |
240 chrome::VersionInfo::GetVersionStringModifier() + ")"); | 240 chrome::VersionInfo::GetVersionStringModifier() + ")"); |
241 | 241 |
242 // OS version information. | 242 // OS version information. |
243 std::string os_label = version_info.OSType(); | 243 std::string os_label = version_info.OSType(); |
244 #if defined(OS_WIN) | 244 #if defined(OS_WIN) |
245 base::win::OSInfo* os = base::win::OSInfo::GetInstance(); | 245 base::win::OSInfo* os = base::win::OSInfo::GetInstance(); |
246 switch (os->version()) { | 246 switch (os->version()) { |
247 case base::win::VERSION_XP: | 247 case base::win::VERSION_XP: os_label += " XP"; break; |
248 os_label += " XP or Server 2003 or XP Pro 64 bit"; | 248 case base::win::VERSION_SERVER_2003: |
| 249 os_label += " Server 2003 or XP Pro 64 bit"; |
249 break; | 250 break; |
250 case base::win::VERSION_VISTA: os_label += " Vista or Server 2008"; break; | 251 case base::win::VERSION_VISTA: os_label += " Vista or Server 2008"; break; |
251 case base::win::VERSION_WIN7: os_label += " 7 or Server 2008 R2"; break; | 252 case base::win::VERSION_WIN7: os_label += " 7 or Server 2008 R2"; break; |
252 case base::win::VERSION_WIN8: os_label += " 8 or Server 2012"; break; | 253 case base::win::VERSION_WIN8: os_label += " 8 or Server 2012"; break; |
253 default: os_label += " UNKNOWN"; break; | 254 default: os_label += " UNKNOWN"; break; |
254 } | 255 } |
255 os_label += " SP" + base::IntToString(os->service_pack().major); | 256 os_label += " SP" + base::IntToString(os->service_pack().major); |
256 if (os->service_pack().minor > 0) | 257 if (os->service_pack().minor > 0) |
257 os_label += "." + base::IntToString(os->service_pack().minor); | 258 os_label += "." + base::IntToString(os->service_pack().minor); |
258 if (os->architecture() == base::win::OSInfo::X64_ARCHITECTURE) | 259 if (os->architecture() == base::win::OSInfo::X64_ARCHITECTURE) |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
375 // Set up the about:flash source. | 376 // Set up the about:flash source. |
376 Profile* profile = Profile::FromWebUI(web_ui); | 377 Profile* profile = Profile::FromWebUI(web_ui); |
377 ChromeURLDataManager::AddDataSource(profile, CreateFlashUIHTMLSource()); | 378 ChromeURLDataManager::AddDataSource(profile, CreateFlashUIHTMLSource()); |
378 } | 379 } |
379 | 380 |
380 // static | 381 // static |
381 base::RefCountedMemory* FlashUI::GetFaviconResourceBytes() { | 382 base::RefCountedMemory* FlashUI::GetFaviconResourceBytes() { |
382 // Use the default icon for now. | 383 // Use the default icon for now. |
383 return NULL; | 384 return NULL; |
384 } | 385 } |
OLD | NEW |