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

Side by Side 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:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/resources/options/controlled_setting.js ('k') | chrome/test/data/policy/policy_test_cases.json » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/webui/options/core_options_handler.h"	5 #include "chrome/browser/ui/webui/options/core_options_handler.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/bind_helpers.h"	8 #include "base/bind_helpers.h"

9 #include "base/json/json_reader.h"	9 #include "base/json/json_reader.h"

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

(...skipping 83 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
94 localized_strings->SetString("controlledSettingExtension",	94 localized_strings->SetString("controlledSettingExtension",

95 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_EXTENSION));	95 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_EXTENSION));

96 localized_strings->SetString("controlledSettingRecommended",	96 localized_strings->SetString("controlledSettingRecommended",

97 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_RECOMMENDED));	97 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_RECOMMENDED));

98 localized_strings->SetString("controlledSettingHasRecommendation",	98 localized_strings->SetString("controlledSettingHasRecommendation",

99 l10n_util::GetStringUTF16(	99 l10n_util::GetStringUTF16(

100 IDS_OPTIONS_CONTROLLED_SETTING_HAS_RECOMMENDATION));	100 IDS_OPTIONS_CONTROLLED_SETTING_HAS_RECOMMENDATION));

101 localized_strings->SetString("controlledSettingFollowRecommendation",	101 localized_strings->SetString("controlledSettingFollowRecommendation",

102 l10n_util::GetStringUTF16(	102 l10n_util::GetStringUTF16(

103 IDS_OPTIONS_CONTROLLED_SETTING_FOLLOW_RECOMMENDATION));	103 IDS_OPTIONS_CONTROLLED_SETTING_FOLLOW_RECOMMENDATION));

	104 localized_strings->SetString("controlledSettingsPolicy",

	105 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTINGS_POLICY));

	106 localized_strings->SetString("controlledSettingsExtension",

	107 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTINGS_EXTENSION));

104	108

105 // Search	109 // Search

106 RegisterTitle(localized_strings, "searchPage", IDS_OPTIONS_SEARCH_PAGE_TITLE);	110 RegisterTitle(localized_strings, "searchPage", IDS_OPTIONS_SEARCH_PAGE_TITLE);

107 localized_strings->SetString("searchPlaceholder",	111 localized_strings->SetString("searchPlaceholder",

108 l10n_util::GetStringUTF16(IDS_OPTIONS_SEARCH_PLACEHOLDER));	112 l10n_util::GetStringUTF16(IDS_OPTIONS_SEARCH_PLACEHOLDER));

109 localized_strings->SetString("searchPageNoMatches",	113 localized_strings->SetString("searchPageNoMatches",

110 l10n_util::GetStringUTF16(IDS_OPTIONS_SEARCH_PAGE_NO_MATCHES));	114 l10n_util::GetStringUTF16(IDS_OPTIONS_SEARCH_PAGE_NO_MATCHES));

111 localized_strings->SetString("searchPageHelpLabel",	115 localized_strings->SetString("searchPageHelpLabel",

112 l10n_util::GetStringUTF16(IDS_OPTIONS_SEARCH_PAGE_HELP_LABEL));	116 l10n_util::GetStringUTF16(IDS_OPTIONS_SEARCH_PAGE_HELP_LABEL));

113 localized_strings->SetString("searchPageHelpTitle",	117 localized_strings->SetString("searchPageHelpTitle",

(...skipping 406 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
520	524

521 void CoreOptionsHandler::UpdatePepperFlashSettingsEnabled() {	525 void CoreOptionsHandler::UpdatePepperFlashSettingsEnabled() {

522 scoped_ptr<base::Value> enabled(	526 scoped_ptr<base::Value> enabled(

523 base::Value::CreateBooleanValue(	527 base::Value::CreateBooleanValue(

524 plugin_status_pref_setter_.IsPepperFlashSettingsEnabled()));	528 plugin_status_pref_setter_.IsPepperFlashSettingsEnabled()));

525 web_ui()->CallJavascriptFunction(	529 web_ui()->CallJavascriptFunction(

526 "OptionsPage.setPepperFlashSettingsEnabled", *enabled);	530 "OptionsPage.setPepperFlashSettingsEnabled", *enabled);

527 }	531 }

528	532

529 } // namespace options	533 } // namespace options

OLD	NEW