Add origin of settings reset request to feedback reports.

chrome/browser/resources/options/reset_profile_settings_overlay.js

 // Copyright 2013 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 AutomaticSettingsResetBanner = options.AutomaticSettingsResetBanner;
 
   /**
@@ skipping 28 matching lines @@
      * @private
      */
     isTriggered_: false,
 
     /** @override */
     initializePage: function() {
       Page.prototype.initializePage.call(this);
 
       // Set the onclick handlers only once when initializing the regular reset
       // profile settings overlay.
       if (!this.isTriggered_) {

[Dan Beam, 2016/09/16 06:29:41]

soooooo, it seems like it doesn't matter whether the dialog isTriggered_ or not
whole adding these listeners. we just don't want to add them twice.  because we
still use this code for the triggered case.

can we just do this instead?

/** @private {boolean} */
ResetProfileSettingOverlay.listenersAdded_ = false;

if (!ResetProfileSettingOverlay.listenersAdded_) {
  ...
  ResetProfileSettingOverlay.listenersAdded_ = true;
}

[alito, 2016/09/16 17:10:18]

Done.

         $('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]);
+                      [$('send-settings').checked,
+                       ResetProfileSettingsOverlay.resetRequestOrigin_]);
         };
         $('expand-feedback').onclick = function(e) {
           var feedbackTemplate = $('feedback-template');
           feedbackTemplate.hidden = !feedbackTemplate.hidden;
           e.preventDefault();
         };
       }
     },
 
     /**
      * @override
      * @suppress {checkTypes}
      * TODO(vitalyp): remove the suppression. See the explanation in
      * chrome/browser/resources/options/automatic_settings_reset_banner.js.
      */
     didShowPage: function() {
       $('reset-profile-settings-title').textContent =
           loadTimeData.getString(this.isTriggered_ ?
               'triggeredResetProfileSettingsOverlay' :
               'resetProfileSettingsOverlay');
       $('reset-profile-settings-explanation').textContent =
           loadTimeData.getString(this.isTriggered_ ?
               'triggeredResetProfileSettingsExplanation' :
               'resetProfileSettingsExplanation');
 
+      // Set ResetProfileSettingsOverlay.resetRequestOrigin_ to indicate where
+      // the reset request came from.
+      //
+      // For the non-triggered reset overlay, a '#userclick' hash indicates that
+      // the reset request came from the user clicking on the reset settings
+      // button and is set by the browser_options page. A '#cct' hash indicates
+      // that the reset request came from the CCT by launching Chrome with the
+      // startup URL chrome://settings/resetProfileSettings#cct.
+      var hash = this.hash.slice(1).toLowerCase();

[Dan Beam, 2016/09/16 06:29:41]

do we need this hash variable if this.isTriggered_?

[alito, 2016/09/16 17:10:18]

Made the triggered case simpler.

+      ResetProfileSettingsOverlay.resetRequestOrigin_ =
+          this.isTriggered_ ?
+          'triggeredreset' :
+          (hash === 'cct' || hash === 'userclick' ? hash : '');
+      this.setHash('');
+
       chrome.send('onShowResetProfileDialog');
     },
 
     /** @override */
     didClosePage: function() {
       chrome.send('onHideResetProfileDialog');
     },
   };
 
   /**
@@ skipping 31 matching lines @@
     var input = new JsEvalContext(feedbackListData);
     var output = $('feedback-template');
     jstProcess(input, output);
   };
 
   // Export
   return {
     ResetProfileSettingsOverlay: ResetProfileSettingsOverlay
   };
 });