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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 localized_strings->SetString("policyAndExtensionManagedPrefsBannerText", | 88 localized_strings->SetString("policyAndExtensionManagedPrefsBannerText", |
89 l10n_util::GetStringUTF16(IDS_OPTIONS_POLICY_EXTENSION_MANAGED_PREFS)); | 89 l10n_util::GetStringUTF16(IDS_OPTIONS_POLICY_EXTENSION_MANAGED_PREFS)); |
90 | 90 |
91 // Controlled settings bubble. | 91 // Controlled settings bubble. |
92 localized_strings->SetString("controlledSettingPolicy", | 92 localized_strings->SetString("controlledSettingPolicy", |
93 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY)); | 93 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY)); |
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("controlledSettingApplyRecommendation", | 98 localized_strings->SetString("controlledSettingHasRecommendation", |
99 l10n_util::GetStringUTF16( | 99 l10n_util::GetStringUTF16( |
100 IDS_OPTIONS_CONTROLLED_SETTING_APPLY_RECOMMENDATION)); | 100 IDS_OPTIONS_CONTROLLED_SETTING_HAS_RECOMMENDATION)); |
| 101 localized_strings->SetString("controlledSettingFollowRecommendation", |
| 102 l10n_util::GetStringUTF16( |
| 103 IDS_OPTIONS_CONTROLLED_SETTING_FOLLOW_RECOMMENDATION)); |
101 | 104 |
102 // Search | 105 // Search |
103 RegisterTitle(localized_strings, "searchPage", IDS_OPTIONS_SEARCH_PAGE_TITLE); | 106 RegisterTitle(localized_strings, "searchPage", IDS_OPTIONS_SEARCH_PAGE_TITLE); |
104 localized_strings->SetString("searchPlaceholder", | 107 localized_strings->SetString("searchPlaceholder", |
105 l10n_util::GetStringUTF16(IDS_OPTIONS_SEARCH_PLACEHOLDER)); | 108 l10n_util::GetStringUTF16(IDS_OPTIONS_SEARCH_PLACEHOLDER)); |
106 localized_strings->SetString("searchPageNoMatches", | 109 localized_strings->SetString("searchPageNoMatches", |
107 l10n_util::GetStringUTF16(IDS_OPTIONS_SEARCH_PAGE_NO_MATCHES)); | 110 l10n_util::GetStringUTF16(IDS_OPTIONS_SEARCH_PAGE_NO_MATCHES)); |
108 localized_strings->SetString("searchPageHelpLabel", | 111 localized_strings->SetString("searchPageHelpLabel", |
109 l10n_util::GetStringUTF16(IDS_OPTIONS_SEARCH_PAGE_HELP_LABEL)); | 112 l10n_util::GetStringUTF16(IDS_OPTIONS_SEARCH_PAGE_HELP_LABEL)); |
110 localized_strings->SetString("searchPageHelpTitle", | 113 localized_strings->SetString("searchPageHelpTitle", |
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
517 | 520 |
518 void CoreOptionsHandler::UpdatePepperFlashSettingsEnabled() { | 521 void CoreOptionsHandler::UpdatePepperFlashSettingsEnabled() { |
519 scoped_ptr<base::Value> enabled( | 522 scoped_ptr<base::Value> enabled( |
520 base::Value::CreateBooleanValue( | 523 base::Value::CreateBooleanValue( |
521 plugin_status_pref_setter_.IsPepperFlashSettingsEnabled())); | 524 plugin_status_pref_setter_.IsPepperFlashSettingsEnabled())); |
522 web_ui()->CallJavascriptFunction( | 525 web_ui()->CallJavascriptFunction( |
523 "OptionsPage.setPepperFlashSettingsEnabled", *enabled); | 526 "OptionsPage.setPepperFlashSettingsEnabled", *enabled); |
524 } | 527 } |
525 | 528 |
526 } // namespace options | 529 } // namespace options |
OLD | NEW |