chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc - Issue 2258553004: Add pref to enable/disable palette tray.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.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

« chrome/browser/ui/ash/palette_delegate_chromeos.cc ('K') | « chrome/browser/ui/webui/options/chromeos/options_note_handler.cc ('k') | chrome/browser/ui/webui/settings/md_settings_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

index 185bb9e3c9c067e73daf40672933d98cfc65f215..0297fee34f41af243d548b0b8f38a68ef770c749 100644

--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

@@ -525,10 +525,10 @@ void AddDeviceStrings(content::WebUIDataSource* html_source) {

arraysize(keyboard_strings));

LocalizedString note_strings[] = {

- {"noteTitle", IDS_SETTINGS_NOTE_TITLE},

- {"noteDefaultAppAutoLaunch", IDS_SETTINGS_NOTE_DEFAULT_APP_AUTO_LAUNCH},

- {"noteFindMoreApps", IDS_SETTINGS_NOTE_FIND_MORE_APPS}

- };

+ {"noteTitle", IDS_SETTINGS_NOTE_TITLE},

+ {"noteEnableAshPalette", IDS_SETTINGS_NOTE_ENABLE_ASH_PALETTE},

+ {"noteDefaultAppAutoLaunch", IDS_SETTINGS_NOTE_DEFAULT_APP_AUTO_LAUNCH},

+ {"noteFindMoreApps", IDS_SETTINGS_NOTE_FIND_MORE_APPS}};

AddLocalizedStringsBulk(html_source, note_strings,

arraysize(note_strings));