Move handling of dialog preferences to Preferences class

chrome/browser/resources/options2/controlled_setting.js

Index: chrome/browser/resources/options2/controlled_setting.js
diff --git a/chrome/browser/resources/options2/controlled_setting.js b/chrome/browser/resources/options2/controlled_setting.js
index 9ff806c178b7686262c33849e8303917040efcaf..3d4747012688ea9f3edf5cbe0fc54340b0014d5e 100644
--- a/chrome/browser/resources/options2/controlled_setting.js
+++ b/chrome/browser/resources/options2/controlled_setting.js
@@ -109,7 +109,7 @@ cr.define('options', function() {
         action.addEventListener(
             'click',
             function(e) {
-              Preferences.clearPref(pref);
+              Preferences.clearPref(pref, self.dialogPref);
             });
         container.appendChild(action);
         bubbleText.appendChild(container);
@@ -131,6 +131,15 @@ cr.define('options', function() {
                     cr.PropertyKind.ATTR,
                     ControlledSettingIndicator.prototype.close);
 
+  /**
+   * A special preference type specific to dialogs. These preferences are reset
+   * when the dialog is closed and are not saved until the user confirms the
+   * dialog.
+   * @type {boolean}
+   */
+  cr.defineProperty(ControlledSettingIndicator, 'dialogPref',
+                    cr.PropertyKind.BOOL_ATTR);
+
   // Export.
   return {
     ControlledSettingIndicator: ControlledSettingIndicator