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

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

Issue 8815014: Add support for recommended settings to the internet details dialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 9 years 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
« no previous file with comments | « chrome/browser/resources/options/chromeos/internet_options.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 0ca4e31f5371bddd12bdd45fb5728f649a96881c..6dfb1e7f00f8462406c0104a9389425bd6b9dea0 100644
--- a/chrome/browser/resources/options/controlled_setting.js
+++ b/chrome/browser/resources/options/controlled_setting.js
@@ -98,8 +98,8 @@ cr.define('options', function() {
bubbleText.className = 'controlled-setting-bubble-text';
bubbleText.textContent = text;
- var pref = self.getAttribute('pref');
- if (self.controlledBy == 'recommended' && pref) {
+ var allowReset = self.getAttribute('allow-reset');
+ if (self.controlledBy == 'recommended' && allowReset) {
var container = doc.createElement('div');
var action = doc.createElement('button');
action.classList.add('link-button');
@@ -109,7 +109,12 @@ cr.define('options', function() {
action.addEventListener(
'click',
function(e) {
- Preferences.clearPref(pref);
+ // Fire the reset event, falling back to just resetting the pref.
+ if (!cr.dispatchSimpleEvent(self, 'reset', true, true)) {
+ var pref = self.getAttribute('pref');
+ if (pref)
+ Preferences.clearPref(pref);
+ }
});
container.appendChild(action);
bubbleText.appendChild(container);
« no previous file with comments | « chrome/browser/resources/options/chromeos/internet_options.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698