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

Unified Diff: chrome/browser/resources/options/controlled_setting.js

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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/options/controlled_setting.js
diff --git a/chrome/browser/resources/options/controlled_setting.js b/chrome/browser/resources/options/controlled_setting.js
index 0d4e76086707fbda54bec31a2cbd6c46ac84f984..40f702ac971b57ab253309f9e0843a358ff92777 100644
--- a/chrome/browser/resources/options/controlled_setting.js
+++ b/chrome/browser/resources/options/controlled_setting.js
@@ -138,13 +138,21 @@ cr.define('options', function() {
var self = this;
// Construct the bubble text.
- defaultStrings = {
- 'policy': loadTimeData.getString('controlledSettingPolicy'),
- 'extension': loadTimeData.getString('controlledSettingExtension'),
- 'recommended': loadTimeData.getString('controlledSettingRecommended'),
- 'hasRecommendation':
- loadTimeData.getString('controlledSettingHasRecommendation'),
- };
+ if (this.hasAttribute('plural')) {
+ var defaultStrings = {
+ 'policy': loadTimeData.getString('controlledSettingsPolicy'),
+ 'extension': loadTimeData.getString('controlledSettingsExtension'),
+ };
+ } else {
+ var defaultStrings = {
+ 'policy': loadTimeData.getString('controlledSettingPolicy'),
+ 'extension': loadTimeData.getString('controlledSettingExtension'),
+ 'recommended':
+ loadTimeData.getString('controlledSettingRecommended'),
+ 'hasRecommendation':
+ loadTimeData.getString('controlledSettingHasRecommendation'),
+ };
+ }
// No controller, no bubble.
if (!this.controlledBy || !(this.controlledBy in defaultStrings))
« no previous file with comments | « chrome/browser/resources/options/browser_options.html ('k') | chrome/browser/ui/webui/options/core_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698