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

Side by Side Diff: chrome/browser/ui/webui/options/core_options_handler.cc

Issue 11272026: Remove the managed banner from the Chrome settings UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 8 years, 1 month 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
OLDNEW
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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 GetStaticLocalizedValues(localized_strings); 73 GetStaticLocalizedValues(localized_strings);
74 } 74 }
75 75
76 void CoreOptionsHandler::GetStaticLocalizedValues( 76 void CoreOptionsHandler::GetStaticLocalizedValues(
77 base::DictionaryValue* localized_strings) { 77 base::DictionaryValue* localized_strings) {
78 DCHECK(localized_strings); 78 DCHECK(localized_strings);
79 // Main 79 // Main
80 localized_strings->SetString("optionsPageTitle", 80 localized_strings->SetString("optionsPageTitle",
81 l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE)); 81 l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE));
82 82
83 // Managed prefs
84 localized_strings->SetString("policyManagedPrefsBannerText",
85 l10n_util::GetStringUTF16(IDS_OPTIONS_POLICY_MANAGED_PREFS));
86 localized_strings->SetString("extensionManagedPrefsBannerText",
87 l10n_util::GetStringUTF16(IDS_OPTIONS_EXTENSION_MANAGED_PREFS));
88 localized_strings->SetString("policyAndExtensionManagedPrefsBannerText",
89 l10n_util::GetStringUTF16(IDS_OPTIONS_POLICY_EXTENSION_MANAGED_PREFS));
90
91 // Controlled settings bubble. 83 // Controlled settings bubble.
92 localized_strings->SetString("controlledSettingPolicy", 84 localized_strings->SetString("controlledSettingPolicy",
93 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY)); 85 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY));
94 localized_strings->SetString("controlledSettingExtension", 86 localized_strings->SetString("controlledSettingExtension",
95 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_EXTENSION)); 87 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_EXTENSION));
96 localized_strings->SetString("controlledSettingRecommended", 88 localized_strings->SetString("controlledSettingRecommended",
97 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_RECOMMENDED)); 89 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_RECOMMENDED));
98 localized_strings->SetString("controlledSettingHasRecommendation", 90 localized_strings->SetString("controlledSettingHasRecommendation",
99 l10n_util::GetStringUTF16( 91 l10n_util::GetStringUTF16(
100 IDS_OPTIONS_CONTROLLED_SETTING_HAS_RECOMMENDATION)); 92 IDS_OPTIONS_CONTROLLED_SETTING_HAS_RECOMMENDATION));
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 535
544 void CoreOptionsHandler::UpdatePepperFlashSettingsEnabled() { 536 void CoreOptionsHandler::UpdatePepperFlashSettingsEnabled() {
545 scoped_ptr<base::Value> enabled( 537 scoped_ptr<base::Value> enabled(
546 base::Value::CreateBooleanValue( 538 base::Value::CreateBooleanValue(
547 plugin_status_pref_setter_.IsPepperFlashSettingsEnabled())); 539 plugin_status_pref_setter_.IsPepperFlashSettingsEnabled()));
548 web_ui()->CallJavascriptFunction( 540 web_ui()->CallJavascriptFunction(
549 "OptionsPage.setPepperFlashSettingsEnabled", *enabled); 541 "OptionsPage.setPepperFlashSettingsEnabled", *enabled);
550 } 542 }
551 543
552 } // namespace options 544 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698