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

Unified Diff: chrome/browser/ui/webui/options/chromeos/options_note_handler.cc

Issue 2258553004: Add pref to enable/disable palette tray. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Initial upload Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options/chromeos/options_note_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/options_note_handler.cc b/chrome/browser/ui/webui/options/chromeos/options_note_handler.cc
index a38250769be735b48c050d7211578a3e09f9555c..2a1b87f157c052ec5baeb288be54093610d080d5 100644
--- a/chrome/browser/ui/webui/options/chromeos/options_note_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/options_note_handler.cc
@@ -25,13 +25,17 @@ void OptionsNoteHandler::GetLocalizedValues(
"noteSettingsButtonTitle",
l10n_util::GetStringUTF16(IDS_OPTIONS_NOTE_TITLE));
localized_strings->SetString(
+ "noteEnableAshPalette",
+ l10n_util::GetStringUTF16(IDS_SETTINGS_NOTE_ENABLE_ASH_PALETTE));
+ localized_strings->SetString(
"noteDefaultAppAutoLaunch",
l10n_util::GetStringUTF16(IDS_SETTINGS_NOTE_DEFAULT_APP_AUTO_LAUNCH));
localized_strings->SetString(
"noteFindMoreApps",
l10n_util::GetStringUTF16(IDS_SETTINGS_NOTE_FIND_MORE_APPS));
- localized_strings->SetBoolean("showNoteSettings", ash::IsPaletteEnabled());
+ localized_strings->SetBoolean("showNoteSettings",
+ ash::IsPaletteFeatureEnabled());
}
void OptionsNoteHandler::InitializePage() {}

Powered by Google App Engine
This is Rietveld 408576698