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

Side by Side Diff: chrome/browser/ui/webui/help/help_handler.cc

Issue 9705092: Add IDS_ABOUT_CROS_VERSION_LICENSE support back to chrome://chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: retry Created 8 years, 9 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/help/help.js ('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/help/help_handler.h" 5 #include "chrome/browser/ui/webui/help/help_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 l10n_util::GetStringUTF16(resources[i].ids)); 145 l10n_util::GetStringUTF16(resources[i].ids));
146 } 146 }
147 147
148 localized_strings->SetString( 148 localized_strings->SetString(
149 "browserVersion", 149 "browserVersion",
150 l10n_util::GetStringFUTF16(IDS_ABOUT_PRODUCT_VERSION, 150 l10n_util::GetStringFUTF16(IDS_ABOUT_PRODUCT_VERSION,
151 BuildBrowserVersionString())); 151 BuildBrowserVersionString()));
152 152
153 string16 license = l10n_util::GetStringFUTF16( 153 string16 license = l10n_util::GetStringFUTF16(
154 IDS_ABOUT_VERSION_LICENSE, 154 IDS_ABOUT_VERSION_LICENSE,
155 #if !defined(OS_CHROMEOS)
156 UTF8ToUTF16(google_util::StringAppendGoogleLocaleParam( 155 UTF8ToUTF16(google_util::StringAppendGoogleLocaleParam(
157 chrome::kChromiumProjectURL)), 156 chrome::kChromiumProjectURL)),
158 #endif
159 ASCIIToUTF16(chrome::kChromeUICreditsURL)); 157 ASCIIToUTF16(chrome::kChromeUICreditsURL));
160 localized_strings->SetString("productLicense", license); 158 localized_strings->SetString("productLicense", license);
161 159
160 #if defined(OS_CHROMEOS)
161 string16 os_license = l10n_util::GetStringFUTF16(
162 IDS_ABOUT_CROS_VERSION_LICENSE,
163 ASCIIToUTF16(chrome::kChromeUIOSCreditsURL));
164 localized_strings->SetString("productOsLicense", os_license);
165 #endif
166
162 string16 tos = l10n_util::GetStringFUTF16( 167 string16 tos = l10n_util::GetStringFUTF16(
163 IDS_ABOUT_TERMS_OF_SERVICE, UTF8ToUTF16(chrome::kChromeUITermsURL)); 168 IDS_ABOUT_TERMS_OF_SERVICE, UTF8ToUTF16(chrome::kChromeUITermsURL));
164 localized_strings->SetString("productTOS", tos); 169 localized_strings->SetString("productTOS", tos);
165 170
166 localized_strings->SetString("webkitVersion", 171 localized_strings->SetString("webkitVersion",
167 webkit_glue::GetWebKitVersion()); 172 webkit_glue::GetWebKitVersion());
168 173
169 localized_strings->SetString("jsEngine", "V8"); 174 localized_strings->SetString("jsEngine", "V8");
170 localized_strings->SetString("jsEngineVersion", v8::V8::GetVersion()); 175 localized_strings->SetString("jsEngineVersion", v8::V8::GetVersion());
171 176
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 web_ui()->CallJavascriptFunction("help.HelpPage.setOSFirmware", 350 web_ui()->CallJavascriptFunction("help.HelpPage.setOSFirmware",
346 *firmware_string); 351 *firmware_string);
347 } 352 }
348 353
349 void HelpHandler::OnReleaseChannel(const std::string& channel) { 354 void HelpHandler::OnReleaseChannel(const std::string& channel) {
350 scoped_ptr<Value> channel_string(Value::CreateStringValue(channel)); 355 scoped_ptr<Value> channel_string(Value::CreateStringValue(channel));
351 web_ui()->CallJavascriptFunction( 356 web_ui()->CallJavascriptFunction(
352 "help.HelpPage.updateSelectedChannel", *channel_string); 357 "help.HelpPage.updateSelectedChannel", *channel_string);
353 } 358 }
354 #endif // defined(OS_CHROMEOS) 359 #endif // defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/resources/help/help.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698