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

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

Issue 13529015: Adjust about:version to read "Blink" rather than "WebKit". (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
« no previous file with comments | « chrome/browser/resources/about_version.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/version_ui.h" 5 #include "chrome/browser/ui/webui/version_ui.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 // Localized and data strings. 44 // Localized and data strings.
45 html_source->AddLocalizedString("title", IDS_ABOUT_VERSION_TITLE); 45 html_source->AddLocalizedString("title", IDS_ABOUT_VERSION_TITLE);
46 chrome::VersionInfo version_info; 46 chrome::VersionInfo version_info;
47 html_source->AddString("version", version_info.Version()); 47 html_source->AddString("version", version_info.Version());
48 html_source->AddString("version_modifier", 48 html_source->AddString("version_modifier",
49 chrome::VersionInfo::GetVersionStringModifier()); 49 chrome::VersionInfo::GetVersionStringModifier());
50 html_source->AddLocalizedString("os_name", IDS_ABOUT_VERSION_OS); 50 html_source->AddLocalizedString("os_name", IDS_ABOUT_VERSION_OS);
51 html_source->AddLocalizedString("platform", IDS_PLATFORM_LABEL); 51 html_source->AddLocalizedString("platform", IDS_PLATFORM_LABEL);
52 html_source->AddString("os_type", version_info.OSType()); 52 html_source->AddString("os_type", version_info.OSType());
53 html_source->AddString("webkit_version", webkit_glue::GetWebKitVersion()); 53 html_source->AddString("blink_version", webkit_glue::GetWebKitVersion());
54 html_source->AddString("js_engine", "V8"); 54 html_source->AddString("js_engine", "V8");
55 html_source->AddString("js_version", v8::V8::GetVersion()); 55 html_source->AddString("js_version", v8::V8::GetVersion());
56 56
57 #if defined(OS_ANDROID) 57 #if defined(OS_ANDROID)
58 html_source->AddLocalizedString("application_label", 58 html_source->AddLocalizedString("application_label",
59 IDS_ABOUT_VERSION_APPLICATION); 59 IDS_ABOUT_VERSION_APPLICATION);
60 html_source->AddString("os_version", AndroidAboutAppInfo::GetOsInfo()); 60 html_source->AddString("os_version", AndroidAboutAppInfo::GetOsInfo());
61 base::android::BuildInfo* android_build_info = 61 base::android::BuildInfo* android_build_info =
62 base::android::BuildInfo::GetInstance(); 62 base::android::BuildInfo::GetInstance();
63 html_source->AddString("application_name", 63 html_source->AddString("application_name",
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 // Set up the chrome://theme/ source. 140 // Set up the chrome://theme/ source.
141 ThemeSource* theme = new ThemeSource(profile); 141 ThemeSource* theme = new ThemeSource(profile);
142 content::URLDataSource::Add(profile, theme); 142 content::URLDataSource::Add(profile, theme);
143 #endif 143 #endif
144 144
145 content::WebUIDataSource::Add(profile, CreateVersionUIDataSource(profile)); 145 content::WebUIDataSource::Add(profile, CreateVersionUIDataSource(profile));
146 } 146 }
147 147
148 VersionUI::~VersionUI() { 148 VersionUI::~VersionUI() {
149 } 149 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/about_version.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698