Index: chrome/browser/ui/webui/options/browser_options_handler.cc |
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc |
index 81315ba0d8b818a8444fd446acc756b1043ca89b..452db3f0ec1fa1e8f06ff3532edd1ce8ef82f19e 100644 |
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc |
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc |
@@ -440,7 +440,6 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) { |
IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION }, |
{ "accessibilityMonoAudio", |
IDS_OPTIONS_SETTINGS_ACCESSIBILITY_MONO_AUDIO_DESCRIPTION}, |
- { "androidAppsTitle", IDS_OPTIONS_ARC_TITLE }, |
{ "androidAppsEnabled", IDS_OPTIONS_ARC_ENABLE }, |
{ "androidAppsSettingsLabel", IDS_OPTIONS_ARC_MANAGE_APPS }, |
{ "arcOptOutConfirmOverlayTabTitle", IDS_ARC_OPT_OUT_TAB_TITLE }, |
@@ -571,6 +570,13 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) { |
RegisterCloudPrintValues(values); |
#endif |
+#if defined(OS_CHROMEOS) |
+ std::string androidAppsTitle = |
xiyuan
2016/09/08 18:01:29
nit: Put a TODO to remove this after merging it to
xdai1
2016/09/08 21:49:02
Done. Thanks for reviewing!
|
+ l10n_util::GetStringUTF8(IDS_OPTIONS_ARC_TITLE) + " (" + |
+ l10n_util::GetStringUTF8(IDS_ABOUT_PAGE_CURRENT_CHANNEL_BETA) + ")"; |
+ values->SetString("androidAppsTitle", androidAppsTitle); |
+#endif |
+ |
values->SetString("syncLearnMoreURL", chrome::kSyncLearnMoreURL); |
base::string16 omnibox_url = base::ASCIIToUTF16(chrome::kOmniboxLearnMoreURL); |
values->SetString( |