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

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

Issue 11464012: [Android] Add support for labeling a build with a particular build id. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: indentation Created 8 years 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #if defined(OS_ANDROID) 58 #if defined(OS_ANDROID)
59 html_source->AddLocalizedString("application_label", 59 html_source->AddLocalizedString("application_label",
60 IDS_ABOUT_VERSION_APPLICATION); 60 IDS_ABOUT_VERSION_APPLICATION);
61 html_source->AddString("os_version", AndroidAboutAppInfo::GetOsInfo()); 61 html_source->AddString("os_version", AndroidAboutAppInfo::GetOsInfo());
62 base::android::BuildInfo* android_build_info = 62 base::android::BuildInfo* android_build_info =
63 base::android::BuildInfo::GetInstance(); 63 base::android::BuildInfo::GetInstance();
64 html_source->AddString("application_name", 64 html_source->AddString("application_name",
65 android_build_info->package_label()); 65 android_build_info->package_label());
66 html_source->AddString("application_version", 66 html_source->AddString("application_version",
67 android_build_info->package_version_name()); 67 android_build_info->package_version_name());
68 html_source->AddLocalizedString("build_id_name",
69 IDS_ABOUT_VERSION_BUILD_ID);
70 html_source->AddString("build_id", CHROME_BUILD_ID);
68 #else 71 #else
69 html_source->AddLocalizedString("application_label", IDS_PRODUCT_NAME); 72 html_source->AddLocalizedString("application_label", IDS_PRODUCT_NAME);
70 html_source->AddString("os_version", std::string()); 73 html_source->AddString("os_version", std::string());
71 html_source->AddString("flash_plugin", "Flash"); 74 html_source->AddString("flash_plugin", "Flash");
72 // Note that the Flash version is retrieve asynchronously and returned in 75 // Note that the Flash version is retrieve asynchronously and returned in
73 // VersionHandler::OnGotPlugins. The area is initially blank. 76 // VersionHandler::OnGotPlugins. The area is initially blank.
74 html_source->AddString("flash_version", std::string()); 77 html_source->AddString("flash_version", std::string());
75 #endif // defined(OS_ANDROID) 78 #endif // defined(OS_ANDROID)
76 79
77 html_source->AddLocalizedString("company", IDS_ABOUT_VERSION_COMPANY_NAME); 80 html_source->AddLocalizedString("company", IDS_ABOUT_VERSION_COMPANY_NAME);
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 ThemeSource* theme = new ThemeSource(profile); 141 ThemeSource* theme = new ThemeSource(profile);
139 ChromeURLDataManager::AddDataSource(profile, theme); 142 ChromeURLDataManager::AddDataSource(profile, theme);
140 #endif 143 #endif
141 144
142 ChromeURLDataManager::AddDataSource(profile, 145 ChromeURLDataManager::AddDataSource(profile,
143 CreateVersionUIDataSource(profile)); 146 CreateVersionUIDataSource(profile));
144 } 147 }
145 148
146 VersionUI::~VersionUI() { 149 VersionUI::~VersionUI() {
147 } 150 }
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