OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/i18n/time_formatting.h" | 7 #include "base/i18n/time_formatting.h" |
8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
9 #include "base/stringprintf.h" | 9 #include "base/stringprintf.h" |
10 #include "base/threading/thread_restrictions.h" | 10 #include "base/threading/thread_restrictions.h" |
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 #if defined(OS_WIN) | 205 #if defined(OS_WIN) |
206 base::win::OSInfo* os = base::win::OSInfo::GetInstance(); | 206 base::win::OSInfo* os = base::win::OSInfo::GetInstance(); |
207 switch (os->version()) { | 207 switch (os->version()) { |
208 case base::win::VERSION_XP: os_label += " XP"; break; | 208 case base::win::VERSION_XP: os_label += " XP"; break; |
209 case base::win::VERSION_SERVER_2003: | 209 case base::win::VERSION_SERVER_2003: |
210 os_label += " Server 2003 or XP Pro 64 bit"; | 210 os_label += " Server 2003 or XP Pro 64 bit"; |
211 break; | 211 break; |
212 case base::win::VERSION_VISTA: os_label += " Vista"; break; | 212 case base::win::VERSION_VISTA: os_label += " Vista"; break; |
213 case base::win::VERSION_SERVER_2008: os_label += " Server 2008"; break; | 213 case base::win::VERSION_SERVER_2008: os_label += " Server 2008"; break; |
214 case base::win::VERSION_WIN7: os_label += " 7"; break; | 214 case base::win::VERSION_WIN7: os_label += " 7"; break; |
| 215 case base::win::VERSION_WIN8: os_label += " 8"; break; |
215 default: os_label += " UNKNOWN"; break; | 216 default: os_label += " UNKNOWN"; break; |
216 } | 217 } |
217 os_label += " SP" + base::IntToString(os->service_pack().major); | 218 os_label += " SP" + base::IntToString(os->service_pack().major); |
218 if (os->service_pack().minor > 0) | 219 if (os->service_pack().minor > 0) |
219 os_label += "." + base::IntToString(os->service_pack().minor); | 220 os_label += "." + base::IntToString(os->service_pack().minor); |
220 if (os->architecture() == base::win::OSInfo::X64_ARCHITECTURE) | 221 if (os->architecture() == base::win::OSInfo::X64_ARCHITECTURE) |
221 os_label += " 64 bit"; | 222 os_label += " 64 bit"; |
222 #endif | 223 #endif |
223 AddPair(list, l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_OS), os_label); | 224 AddPair(list, l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_OS), os_label); |
224 | 225 |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
337 // Set up the about:flash source. | 338 // Set up the about:flash source. |
338 Profile* profile = Profile::FromBrowserContext(contents->browser_context()); | 339 Profile* profile = Profile::FromBrowserContext(contents->browser_context()); |
339 profile->GetChromeURLDataManager()->AddDataSource(CreateFlashUIHTMLSource()); | 340 profile->GetChromeURLDataManager()->AddDataSource(CreateFlashUIHTMLSource()); |
340 } | 341 } |
341 | 342 |
342 // static | 343 // static |
343 RefCountedMemory* FlashUI::GetFaviconResourceBytes() { | 344 RefCountedMemory* FlashUI::GetFaviconResourceBytes() { |
344 // Use the default icon for now. | 345 // Use the default icon for now. |
345 return NULL; | 346 return NULL; |
346 } | 347 } |
OLD | NEW |