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

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

Issue 191033002: Polish the appearance of the Controlled by Extension bubble. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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/uber/uber.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE)); 92 l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE));
93 93
94 // Controlled settings bubble. 94 // Controlled settings bubble.
95 localized_strings->SetString("controlledSettingPolicy", 95 localized_strings->SetString("controlledSettingPolicy",
96 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY)); 96 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY));
97 localized_strings->SetString("controlledSettingExtension", 97 localized_strings->SetString("controlledSettingExtension",
98 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_EXTENSION)); 98 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_EXTENSION));
99 localized_strings->SetString("controlledSettingExtensionWithName", 99 localized_strings->SetString("controlledSettingExtensionWithName",
100 l10n_util::GetStringUTF16( 100 l10n_util::GetStringUTF16(
101 IDS_OPTIONS_CONTROLLED_SETTING_EXTENSION_WITH_NAME)); 101 IDS_OPTIONS_CONTROLLED_SETTING_EXTENSION_WITH_NAME));
102 localized_strings->SetString("controlledSettingManageExtensions", 102 localized_strings->SetString("controlledSettingManageExtension",
103 l10n_util::GetStringUTF16( 103 l10n_util::GetStringUTF16(
104 IDS_OPTIONS_CONTROLLED_SETTING_MANAGE_EXTENSIONS)); 104 IDS_OPTIONS_CONTROLLED_SETTING_MANAGE_EXTENSION));
105 localized_strings->SetString("controlledSettingDisableExtension", 105 localized_strings->SetString("controlledSettingDisableExtension",
106 l10n_util::GetStringUTF16(IDS_EXTENSIONS_DISABLE)); 106 l10n_util::GetStringUTF16(IDS_EXTENSIONS_DISABLE));
107 localized_strings->SetString("controlledSettingRecommended", 107 localized_strings->SetString("controlledSettingRecommended",
108 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_RECOMMENDED)); 108 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_RECOMMENDED));
109 localized_strings->SetString("controlledSettingHasRecommendation", 109 localized_strings->SetString("controlledSettingHasRecommendation",
110 l10n_util::GetStringUTF16( 110 l10n_util::GetStringUTF16(
111 IDS_OPTIONS_CONTROLLED_SETTING_HAS_RECOMMENDATION)); 111 IDS_OPTIONS_CONTROLLED_SETTING_HAS_RECOMMENDATION));
112 localized_strings->SetString("controlledSettingFollowRecommendation", 112 localized_strings->SetString("controlledSettingFollowRecommendation",
113 l10n_util::GetStringUTF16( 113 l10n_util::GetStringUTF16(
114 IDS_OPTIONS_CONTROLLED_SETTING_FOLLOW_RECOMMENDATION)); 114 IDS_OPTIONS_CONTROLLED_SETTING_FOLLOW_RECOMMENDATION));
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 } 619 }
620 620
621 void CoreOptionsHandler::UpdatePepperFlashSettingsEnabled() { 621 void CoreOptionsHandler::UpdatePepperFlashSettingsEnabled() {
622 base::FundamentalValue enabled( 622 base::FundamentalValue enabled(
623 plugin_status_pref_setter_.IsPepperFlashSettingsEnabled()); 623 plugin_status_pref_setter_.IsPepperFlashSettingsEnabled());
624 web_ui()->CallJavascriptFunction( 624 web_ui()->CallJavascriptFunction(
625 "OptionsPage.setPepperFlashSettingsEnabled", enabled); 625 "OptionsPage.setPepperFlashSettingsEnabled", enabled);
626 } 626 }
627 627
628 } // namespace options 628 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/resources/uber/uber.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698