Merges two options reset overlay classes

chrome/browser/resources/options/reset_profile_settings_overlay.js

Index: chrome/browser/resources/options/reset_profile_settings_overlay.js
diff --git a/chrome/browser/resources/options/reset_profile_settings_overlay.js b/chrome/browser/resources/options/reset_profile_settings_overlay.js
index 7da9e29642459e099cd8debd5830e9bf03aed3f9..4a31dcbd1c445609c3b7f3838465e57083b2d5be 100644
--- a/chrome/browser/resources/options/reset_profile_settings_overlay.js
+++ b/chrome/browser/resources/options/reset_profile_settings_overlay.js
@@ -9,39 +9,61 @@ cr.define('options', function() {
 
   /**
    * ResetProfileSettingsOverlay class
-   * Encapsulated handling of the 'Reset Profile Settings' overlay page.
+   *
+   * Encapsulated handling of the 'Reset Profile Settings' and the 'Triggered
+   * Reset Profile Settings' overlay pages. See triggered_profile_resetter.h for
+   * when the triggered variant will be used.
+   *
    * @constructor
+   * @param {boolean} is_triggered Whether the overlay is the triggered variant.
    * @extends {cr.ui.pageManager.Page}
    */
-  function ResetProfileSettingsOverlay() {
-    Page.call(this, 'resetProfileSettings',
-              loadTimeData.getString('resetProfileSettingsOverlayTabTitle'),
-              'reset-profile-settings-overlay');
+  function ResetProfileSettingsOverlay(is_triggered) {

[Dan Beam, 2016/09/14 21:22:37]

jsVarsLikeThis

[alito, 2016/09/14 23:37:45]

Done.

+    if (is_triggered) {
+      Page.call(this, 'triggeredResetProfileSettings',
+                loadTimeData.getString('triggeredResetProfileSettingsOverlay'),
+                'reset-profile-settings-overlay');
+      this.is_triggered_reset_ = true;
+    } else {
+      Page.call(this, 'resetProfileSettings',
+                loadTimeData.getString('resetProfileSettingsOverlayTabTitle'),
+                'reset-profile-settings-overlay');
+      this.is_triggered_reset_ = false;
+    }

[Dan Beam, 2016/09/14 21:22:37]

this.isTriggered_ = isTriggered;
Page.call(
    this,
    isTriggered ? 'triggeredResetProfileSettings' : 'resetProfileSettings',
    loadTimeData.getString(isTriggered ?
        'triggeredResetProfileSettingsOverlay' :
        'resetProfileSettingsOverlayTabTitle'),
    'reset-profile-settings-overlay');

[alito, 2016/09/14 23:37:45]

Done.

   }
 
-  cr.addSingletonGetter(ResetProfileSettingsOverlay);
-
   ResetProfileSettingsOverlay.prototype = {
     // Inherit ResetProfileSettingsOverlay from Page.
     __proto__: Page.prototype,
 
+    /**
+     * Indicates whether the overlay is a triggered reset overlay.
+     * @type {boolean}
+     * @private
+     */
+    is_triggered_reset_: false,

[Dan Beam, 2016/09/14 21:22:38]

jsPrivateMembersLikeThis_

[alito, 2016/09/14 23:37:45]

Done.

+
     /** @override */
     initializePage: function() {
       Page.prototype.initializePage.call(this);
 
-      $('reset-profile-settings-dismiss').onclick = function(e) {
-        ResetProfileSettingsOverlay.dismiss();
-      };
-      $('reset-profile-settings-commit').onclick = function(e) {
-        ResetProfileSettingsOverlay.setResettingState(true);
-        chrome.send('performResetProfileSettings',
-                    [$('send-settings').checked]);
-      };
-      $('expand-feedback').onclick = function(e) {
-        var feedbackTemplate = $('feedback-template');
-        feedbackTemplate.hidden = !feedbackTemplate.hidden;
-        e.preventDefault();
-      };
+      // Set the onclick handlers only once when initializing the regular reset
+      // profile settings overlay.
+      if (!this.is_triggered_reset_) {
+        $('reset-profile-settings-dismiss').onclick = function(e) {
+          ResetProfileSettingsOverlay.dismiss();
+        };
+        $('reset-profile-settings-commit').onclick = function(e) {
+          ResetProfileSettingsOverlay.setResettingState(true);
+          chrome.send('performResetProfileSettings',
+                      [$('send-settings').checked]);
+        };
+        $('expand-feedback').onclick = function(e) {
+          var feedbackTemplate = $('feedback-template');
+          feedbackTemplate.hidden = !feedbackTemplate.hidden;
+          e.preventDefault();
+        };
+      }
     },
 
     /**
@@ -51,10 +73,17 @@ cr.define('options', function() {
      * chrome/browser/resources/options/automatic_settings_reset_banner.js.
      */
     didShowPage: function() {
-      $('reset-profile-settings-title').textContent =
-          loadTimeData.getString('resetProfileSettingsOverlay');
-      $('reset-profile-settings-explanation').textContent =
-          loadTimeData.getString('resetProfileSettingsExplanation');
+      if (this.is_triggered_reset_) {
+        $('reset-profile-settings-title').textContent =
+            loadTimeData.getString('triggeredResetProfileSettingsOverlay');

[Dan Beam, 2016/09/14 21:22:37]

$('reset-profile-settings-title').textContent =
    loadTimeData.getString(isTriggered ? 
        'triggeredResetProfileSettingsOverlay' :
         'resetProfileSettingsOverlay');
$('reset-profile-settings-explanation').textContent =
     loadTimeData.getString(isTriggered ?
         'triggeredResetProfileSettingsExplanation' :
         'resetProfileSettingsOverlay');

[alito, 2016/09/14 23:37:45]

Done.

+        $('reset-profile-settings-explanation').textContent =
+            loadTimeData.getString('triggeredResetProfileSettingsExplanation');
+      } else {
+        $('reset-profile-settings-title').textContent =
+            loadTimeData.getString('resetProfileSettingsOverlay');
+        $('reset-profile-settings-explanation').textContent =
+            loadTimeData.getString('resetProfileSettingsExplanation');
+      }
 
       chrome.send('onShowResetProfileDialog');
     },