Merges two options reset overlay classes

This merges ResetProfileSettingsOverlay and
TriggeredResetProfileSettingsOverlay into a single class.

BUG=636435
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2334003006
Cr-Commit-Position: refs/heads/master@{#418876}

chrome/browser/resources/options/options.js

@@ -47,8 +47,6 @@ var SupervisedUserImportOverlay = options.SupervisedUserImportOverlay;
 var SupervisedUserLearnMoreOverlay = options.SupervisedUserLearnMoreOverlay;
 var SyncSetupOverlay = options.SyncSetupOverlay;
 var ThirdPartyImeConfirmOverlay = options.ThirdPartyImeConfirmOverlay;
-var TriggeredResetProfileSettingsOverlay =
-    options.TriggeredResetProfileSettingsOverlay;
 
 /**
  * DOMContentLoaded handler, sets up the page.
@@ -165,9 +163,10 @@ function load() {
   PageManager.registerOverlay(PasswordManager.getInstance(),
                               BrowserOptions.getInstance(),
                               [$('manage-passwords')]);
-  PageManager.registerOverlay(ResetProfileSettingsOverlay.getInstance(),
-                              BrowserOptions.getInstance(),
-                              [$('reset-profile-settings')]);
+  PageManager.registerOverlay(
+      new ResetProfileSettingsOverlay(false /* isTriggered */),
+      BrowserOptions.getInstance(),
+      [$('reset-profile-settings')]);
   PageManager.registerOverlay(SearchEngineManager.getInstance(),
                               BrowserOptions.getInstance(),
                               [$('manage-default-search-engines')]);
@@ -179,7 +178,7 @@ function load() {
 
 <if expr="is_win">
   PageManager.registerOverlay(
-      TriggeredResetProfileSettingsOverlay.getInstance(),
+      new ResetProfileSettingsOverlay(true /* isTriggered */),
       BrowserOptions.getInstance());
 </if>
 

chrome/browser/resources/options/options_bundle.js

@@ -125,9 +125,6 @@ var CertificateImportErrorOverlay = options.CertificateImportErrorOverlay;
 <include src="supervised_user_list_data.js">
 <include src="../help/help_page.js">
 <include src="sync_setup_overlay.js">
-<if expr="is_win">
-<include src="triggered_reset_profile_settings_overlay.js">
-</if>
 <include src="../uber/uber_page_manager_observer.js">
 <include src="../uber/uber_utils.js">
 <include src="options.js">

chrome/browser/resources/options/reset_profile_settings_overlay.js

@@ -9,39 +9,58 @@ 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} isTriggered 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(isTriggered) {
+    this.isTriggered_ = isTriggered;
+    Page.call(
+        this,
+        isTriggered ? 'triggeredResetProfileSettings' : 'resetProfileSettings',
+        loadTimeData.getString(isTriggered ?
+            'triggeredResetProfileSettingsOverlay' :
+            'resetProfileSettingsOverlayTabTitle'),
+        'reset-profile-settings-overlay');
   }
 
-  cr.addSingletonGetter(ResetProfileSettingsOverlay);
-
   ResetProfileSettingsOverlay.prototype = {
     // Inherit ResetProfileSettingsOverlay from Page.
     __proto__: Page.prototype,
 
+    /**
+     * Indicates whether the overlay is a triggered reset overlay.
+     * @type {boolean}
+     * @private
+     */
+    isTriggered_: false,
+
     /** @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.isTriggered_) {
+        $('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();
+        };
+      }
     },
 
     /**
@@ -52,9 +71,13 @@ cr.define('options', function() {
      */
     didShowPage: function() {
       $('reset-profile-settings-title').textContent =
-          loadTimeData.getString('resetProfileSettingsOverlay');
+          loadTimeData.getString(this.isTriggered_ ?
+              'triggeredResetProfileSettingsOverlay' :
+              'resetProfileSettingsOverlay');
       $('reset-profile-settings-explanation').textContent =
-          loadTimeData.getString('resetProfileSettingsExplanation');
+          loadTimeData.getString(this.isTriggered_ ?
+              'triggeredResetProfileSettingsExplanation' :
+              'resetProfileSettingsExplanation');
 
       chrome.send('onShowResetProfileDialog');
     },

chrome/browser/resources/options/triggered_reset_profile_settings_overlay.js

-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-cr.define('options', function() {
-  var Page = cr.ui.pageManager.Page;
-
-  var ResetProfileSettingsOverlay = options.ResetProfileSettingsOverlay;
-
-  /**
-   * TriggeredResetProfileSettingsOverlay class
-   * Encapsulated handling of the triggered variant of the 'Reset Profile
-   * Settings' overlay page. Identical to ResetProfileSettingsOverlay but in a
-   * new class to get a new overlay url mapping. See
-   * triggered_profile_resetter.h for when this will be used.
-   * @constructor
-   * @extends {options.ResetProfileSettingsOverlay}
-   */
-  function TriggeredResetProfileSettingsOverlay() {
-    // Note here that 'reset-profile-settings-overlay' is intentionally used as
-    // the pageDivName argument to reuse the layout and CSS from the reset
-    // profile settings overlay defined in reset_profile_settings_overlay.js.
-    Page.call(this, 'triggeredResetProfileSettings',
-              loadTimeData.getString('triggeredResetProfileSettingsOverlay'),
-              'reset-profile-settings-overlay');
-  }
-
-  cr.addSingletonGetter(TriggeredResetProfileSettingsOverlay);
-
-  TriggeredResetProfileSettingsOverlay.prototype = {
-    __proto__: ResetProfileSettingsOverlay.prototype,
-
-    /** @override */
-    didShowPage: function() {
-      $('reset-profile-settings-title').textContent =
-          loadTimeData.getString('triggeredResetProfileSettingsOverlay');
-      $('reset-profile-settings-explanation').textContent =
-          loadTimeData.getString('triggeredResetProfileSettingsExplanation');
-      chrome.send('onShowResetProfileDialog');
-    },
-  };
-
-  // Export
-  return {
-    TriggeredResetProfileSettingsOverlay: TriggeredResetProfileSettingsOverlay
-  };
-});