[Hotword] Make ConfirmDialog subclass from SettingsDialog

chrome/browser/resources/options/confirm_dialog.js

 // Copyright (c) 2012 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() {
-  /** @const */ var OptionsPage = options.OptionsPage;
+  /** @const */ var SettingsDialog = options.SettingsDialog;
 
   /**
    * A dialog that will pop up when the user attempts to set the value of the
    * Boolean |pref| to |true|, asking for confirmation. If the user clicks OK,
    * the new value is committed to Chrome. If the user clicks Cancel or leaves
    * the settings page, the new value is discarded.
    * @constructor
    * @param {string} name See OptionsPage constructor.
    * @param {string} title See OptionsPage constructor.
    * @param {string} pageDivName See OptionsPage constructor.
    * @param {HTMLInputElement} okButton The confirmation button element.
    * @param {HTMLInputElement} cancelButton The cancellation button element.
    * @param {string} pref The pref that requires confirmation.
    * @param {string} metric User metrics identifier.
    * @param {string} confirmed_pref A pref used to remember whether the user has
    *     confirmed the dialog before. This ensures that the user is presented
    *     with the dialog only once. If left |undefined| or |null|, the dialog
    *     will pop up every time the user attempts to set |pref| to |true|.
-   * @extends {OptionsPage}
+   * @extends {SettingsDialog}
    */
   function ConfirmDialog(name, title, pageDivName, okButton, cancelButton, pref,
                          metric, confirmed_pref) {
-    OptionsPage.call(this, name, title, pageDivName);
-    this.okButton = okButton;
-    this.cancelButton = cancelButton;
+    SettingsDialog.call(this, name, title, pageDivName, okButton, cancelButton);
     this.pref = pref;
     this.metric = metric;
     this.confirmed_pref = confirmed_pref;
     this.confirmed_ = false;
   }
 
   ConfirmDialog.prototype = {
     // Set up the prototype chain
-    __proto__: OptionsPage.prototype,
+    __proto__: SettingsDialog.prototype,
 
     /**
      * Handle changes to |pref|. Only uncommitted changes are relevant as these
      * originate from user and need to be explicitly committed to take effect.
      * Pop up the dialog or commit the change, depending on whether confirmation
      * is needed.
      * @param {Event} event Change event.
      * @private
      */
     onPrefChanged_: function(event) {
@@ skipping 10 matching lines @@
      * Handle changes to |confirmed_pref| by caching them.
      * @param {Event} event Change event.
      * @private
      */
     onConfirmedChanged_: function(event) {
       this.confirmed_ = event.value.value;
     },
 
     /** @override */
     initializePage: function() {
+      SettingsDialog.prototype.initializePage.call(this);
+
       this.okButton.onclick = this.handleConfirm.bind(this);
       this.cancelButton.onclick = this.handleCancel.bind(this);
       Preferences.getInstance().addEventListener(
           this.pref, this.onPrefChanged_.bind(this));
       if (this.confirmed_pref) {
         Preferences.getInstance().addEventListener(
             this.confirmed_pref, this.onConfirmedChanged_.bind(this));
       }
     },
 
     /**
      * Handle the confirm button by committing the |pref| change. If
      * |confirmed_pref| has been specified, also remember that the dialog has
      * been confirmed to avoid bringing it up in the future.
+     * @override
      */
     handleConfirm: function() {
-      OptionsPage.closeOverlay();
-
       Preferences.getInstance().commitPref(this.pref, this.metric);
       if (this.confirmed_pref)
         Preferences.setBooleanPref(this.confirmed_pref, true, true);
+
+      SettingsDialog.prototype.handleConfirm.call(this);

[Dan Beam, 2014/03/27 21:06:43]

^ why is this at the bottom?

[rpetterson, 2014/03/27 21:26:00]

Done.

To answer your question, the thought was that we wanted to manage our own state
before the base class closes the dialog but it doesn't appear to be necessary
since the dialog closes right after.

     },
 
     /**
      * Handle the cancel button by rolling back the |pref| change without it
      * ever taking effect.
+     * @override
      */
     handleCancel: function() {
-      OptionsPage.closeOverlay();
-
       Preferences.getInstance().rollbackPref(this.pref);
+      SettingsDialog.prototype.handleCancel.call(this);

[Dan Beam, 2014/03/27 21:06:43]

same

[rpetterson, 2014/03/27 21:26:00]

Done.

     },
 
     /**
      * When a user navigates away from a confirm dialog, treat as a cancel.
      * @protected
      * @override
      */
     willHidePage: function() {
       if (this.visible)
         Preferences.getInstance().rollbackPref(this.pref);
     },
   };
 
   return {
     ConfirmDialog: ConfirmDialog
   };
 });