chrome/browser/ui/webui/options/core_options_handler.cc - Issue 11189060: Add controlled setting indicator for proxy configuration

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/options/core_options_handler.cc

Issue 11189060: Add controlled setting indicator for proxy configuration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Re-add accidentally deleted blank line. Created 8 years, 2 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:

Index: chrome/browser/ui/webui/options/core_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc

index f2bcaaf411866a84d45012950b8c1b576957de71..3b7963a498713c9f45a7162bbbb61e54730c5378 100644

--- a/chrome/browser/ui/webui/options/core_options_handler.cc

+++ b/chrome/browser/ui/webui/options/core_options_handler.cc

@@ -101,6 +101,10 @@ void CoreOptionsHandler::GetStaticLocalizedValues(

localized_strings->SetString("controlledSettingFollowRecommendation",

l10n_util::GetStringUTF16(

IDS_OPTIONS_CONTROLLED_SETTING_FOLLOW_RECOMMENDATION));

+ localized_strings->SetString("controlledSettingsPolicy",

+ l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTINGS_POLICY));

+ localized_strings->SetString("controlledSettingsExtension",

+ l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTINGS_EXTENSION));

// Search

RegisterTitle(localized_strings, "searchPage", IDS_OPTIONS_SEARCH_PAGE_TITLE);