Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Side by Side Diff: chrome/browser/ui/webui/flash_ui.cc

Issue 7249003: Move GetVersionStringModifier() and GetChannel() from platform_util_* to chrome_version_info_* (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: correct nits Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/threading/thread_restrictions.h" 9 #include "base/threading/thread_restrictions.h"
10 #include "base/timer.h" 10 #include "base/timer.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/browser/crash_upload_list.h" 13 #include "chrome/browser/crash_upload_list.h"
14 #include "chrome/browser/platform_util.h"
15 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" 15 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
17 #include "chrome/browser/ui/webui/crashes_ui.h" 16 #include "chrome/browser/ui/webui/crashes_ui.h"
18 #include "chrome/common/chrome_version_info.h" 17 #include "chrome/common/chrome_version_info.h"
19 #include "chrome/common/jstemplate_builder.h" 18 #include "chrome/common/jstemplate_builder.h"
20 #include "chrome/common/url_constants.h" 19 #include "chrome/common/url_constants.h"
21 #include "content/browser/gpu/gpu_data_manager.h" 20 #include "content/browser/gpu/gpu_data_manager.h"
22 #include "content/browser/tab_contents/tab_contents.h" 21 #include "content/browser/tab_contents/tab_contents.h"
23 #include "content/browser/user_metrics.h" 22 #include "content/browser/user_metrics.h"
24 #include "grit/generated_resources.h" 23 #include "grit/generated_resources.h"
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 228
230 // Obtain the Chrome version info. 229 // Obtain the Chrome version info.
231 chrome::VersionInfo version_info; 230 chrome::VersionInfo version_info;
232 231
233 ListValue* list = new ListValue(); 232 ListValue* list = new ListValue();
234 233
235 // Chrome version information. 234 // Chrome version information.
236 AddPair(list, 235 AddPair(list,
237 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), 236 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
238 version_info.Version() + " (" + 237 version_info.Version() + " (" +
239 platform_util::GetVersionStringModifier() + ")"); 238 chrome::VersionInfo::GetVersionStringModifier() + ")");
240 239
241 // OS version information. 240 // OS version information.
242 std::string os_label = version_info.OSType(); 241 std::string os_label = version_info.OSType();
243 #if defined(OS_WIN) 242 #if defined(OS_WIN)
244 base::win::OSInfo* os = base::win::OSInfo::GetInstance(); 243 base::win::OSInfo* os = base::win::OSInfo::GetInstance();
245 switch (os->version()) { 244 switch (os->version()) {
246 case base::win::VERSION_XP: os_label += " XP"; break; 245 case base::win::VERSION_XP: os_label += " XP"; break;
247 case base::win::VERSION_SERVER_2003: 246 case base::win::VERSION_SERVER_2003:
248 os_label += " Server 2003 or XP Pro 64 bit"; 247 os_label += " Server 2003 or XP Pro 64 bit";
249 break; 248 break;
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 373
375 // Set up the about:flash source. 374 // Set up the about:flash source.
376 contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source); 375 contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
377 } 376 }
378 377
379 // static 378 // static
380 RefCountedMemory* FlashUI::GetFaviconResourceBytes() { 379 RefCountedMemory* FlashUI::GetFaviconResourceBytes() {
381 // Use the default icon for now. 380 // Use the default icon for now.
382 return NULL; 381 return NULL;
383 } 382 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/about_chrome_view.cc ('k') | chrome/browser/ui/webui/gpu_internals_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698