Attach performance tracing data to feedback reports

chrome/browser/resources/feedback.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.
 
 // Constants.
 /** @const */ var FEEDBACK_LANDING_PAGE =
     'https://www.google.com/support/chrome/go/feedback_confirmation';
 /** @const */ var MAX_ATTACH_FILE_SIZE = 3 * 1024 * 1024;
 
 var selectedThumbnailDivId = '';
 var selectedThumbnailId = '';
 var selectedImageUrl;
 
 var savedThumbnailIds = [];
 savedThumbnailIds['current-screenshots'] = '';
 savedThumbnailIds['saved-screenshots'] = '';
 
 var categoryTag = '';
 var filePath = '';
 var forceDisableScreenshots = false;
+var traceId = 0;
 
 // Globals to manage reading data from the attach a file option.
 var attachFileBinaryData = '';
 var lastReader = null;
 
 /**
  * Returns the base filename for a given path. Handles only Unix style paths.
  * @param {string} path The path to return the basename for.
  * @return {string} Basename for the path.
  */
@@ skipping 146 matching lines @@
 
   var reportArray = [pageUrl,
                      categoryTag,
                      $('description-text').value,
                      userEmail,
                      imagePath];
 
   // Add chromeos data if it exists.
   if ($('sys-info-checkbox')) {
     reportArray = reportArray.concat([String($('sys-info-checkbox').checked)]);
+    if (!$('performance-info-checkbox').checked) {
+      traceId = 0;
+    }
+    reportArray = reportArray.concat([String(traceId)]);
   }
 
   if ($('attach-file-checkbox') &&
       $('attach-file-checkbox').checked) {
     if (attachFileBinaryData) {
       reportArray = reportArray.concat(
           [$('attach-file').files[0].name, btoa(attachFileBinaryData)]);
     }
   } else if ($('attach-file-custom-checkbox') &&
              $('attach-file-custom-checkbox').checked) {
@@ skipping 70 matching lines @@
   $('screenshot-label-current').hidden = false;
   $('screenshot-label-saved').hidden = true;
 
   // Change the link to say "go to saved"
   $('screenshot-link-tosaved').hidden = false;
   $('screenshot-link-tocurrent').hidden = true;
 
   currentSelected();
 }
 
+<if expr="pp_ifdef('chromeos')">
+/**
+ * Update the page when performance feedback state is changed.
+ */
+function performanceFeedbackChanged() {
+  if ($('performance-info-checkbox').checked) {
+    $('attach-file-checkbox').disabled = true;
+    $('attach-file-checkbox').checked = false;
+
+    $('screenshot-checkbox').disabled = true;
+    $('screenshot-checkbox').checked = false;
+  } else {
+    $('attach-file-checkbox').disabled = false;
+    $('screenshot-checkbox').disabled = false;
+  }
+}
+</if>
+
 ///////////////////////////////////////////////////////////////////////////////
 // Document Functions:
 /**
  * Window onload handler, sets up the page.
  */
 function load() {
   cr.ui.FocusOutlineManager.forDocument(document);
   if ($('attach-file'))
     $('attach-file').addEventListener('change', onFileSelected);
 
   if ($('sysinfo-url')) {
     $('sysinfo-url').onclick = function(event) {
       chrome.send('openSystemTab');
     };
   }
 
 <if expr="pp_ifdef('chromeos')">
   $('screenshot-link-tosaved').onclick = changeToSaved;
   $('screenshot-link-tocurrent').onclick = changeToCurrent;
+
+  $('performance-info-checkbox').addEventListener(
+      'change', performanceFeedbackChanged);
 </if>
   $('send-report-button').onclick = sendReport;
   $('cancel-button').onclick = cancel;
 
   // Set default values for the possible parameters, and then parse the actual
   // values from the URL href.
   var parameters = {
     'description': '',
     'categoryTag': '',
     'customPageUrl': '',
     'filePath': '',
+    'traceId': 0,
   };
 
   var loc = window.location;
   // Split the query string into an array of parameters.
   var query = loc.search.substr(1).split('&');
   // If we have a query in the hash.
   if (loc.hash.indexOf('?') >= 0) {
     // Remove the hash and split this query into parameters too.
     query = query.concat(loc.hash.substr(loc.hash.indexOf('?') + 1).split('&'));
   }
@@ skipping 33 matching lines @@
       $('attach-file-custom-container').hidden = false;
       // No screenshots if we're being invoked by an extension - screenshot was
       // never taken.
       $('screenshot-checkbox').checked = false;
       forceDisableScreenshots = true;
     } else {
       filePath = '';
     }
   }
 
+  traceId = parameters['traceId'];
+  if (traceId != 0) {

[rkc, 2013/08/09 21:52:45]

add a && ($('performance-info-area')) to the if to handle non-ChromeOS builds.

[Zachary Kuznia, 2013/08/09 22:10:12]

Done.

+    $('performance-info-area').hidden = false;
+    $('performance-info-checkbox').checked = true;
+    performanceFeedbackChanged();
+  }
+
   chrome.send('getDialogDefaults');
   chrome.send('refreshCurrentScreenshot');
 }
 
 function setupCurrentScreenshot(screenshot) {
   addScreenshot('current-screenshots', screenshot);
 }
 
 function setupSavedScreenshots(screenshots) {
   if (screenshots.length == 0) {
@@ skipping 34 matching lines @@
 
   if (!defaults.disableScreenshots)
     enableScreenshots();
 
   if (defaults.useSaved) {
     $('screenshot-link-tosaved').hidden = false;
   }
 }
 
 window.addEventListener('DOMContentLoaded', load);