| 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..60d8888c69900e5cc4358c960e522104d3eaa78c 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,14 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
|
| RegisterCloudPrintValues(values);
|
| #endif
|
|
|
| + // TODO(xdai): Revert this after it's merged to M53.
|
| +#if defined(OS_CHROMEOS)
|
| + std::string android_apps_title =
|
| + l10n_util::GetStringUTF8(IDS_OPTIONS_ARC_TITLE) + " (" +
|
| + l10n_util::GetStringUTF8(IDS_ABOUT_PAGE_CURRENT_CHANNEL_BETA) + ")";
|
| + values->SetString("androidAppsTitle", android_apps_title);
|
| +#endif
|
| +
|
| values->SetString("syncLearnMoreURL", chrome::kSyncLearnMoreURL);
|
| base::string16 omnibox_url = base::ASCIIToUTF16(chrome::kOmniboxLearnMoreURL);
|
| values->SetString(
|
|
|