Send compressed histograms with system logs when sending feedback.

chrome/browser/resources/feedback/js/feedback.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.
 
 /** @type {string}
  * @const
  */
 var FEEDBACK_LANDING_PAGE =
     'https://www.google.com/support/chrome/go/feedback_confirmation';
 /** @type {number}
  * @const
  */
 var MAX_ATTACH_FILE_SIZE = 3 * 1024 * 1024;
 
 var attachedFileBlob = null;
 var lastReader = null;
 
 var feedbackInfo = null;
 var systemInfo = null;
 
-var systemInfoWindowId = 0;
+var systemInfoWindow = {id: 0};
+var histogramsWindow = {id: 0};
 
 /**
  * Reads the selected file when the user selects a file.
  * @param {Event} fileSelectedEvent The onChanged event for the file input box.
  */
 function onFileSelected(fileSelectedEvent) {
   $('attach-error').hidden = true;
   var file = fileSelectedEvent.target.files[0];
   if (!file) {
     // User canceled file selection.
@@ skipping 19 matching lines @@
  * attach another file.
  */
 function clearAttachedFile() {
   $('custom-file-container').hidden = true;
   attachedFileBlob = null;
   feedbackInfo.attachedFile = null;
   $('attach-file').hidden = false;
 }
 
 /**
- * Opens a new window with chrome://system, showing the current system info.
+ * Creates and shows a window with the given url, if the window is not already
+ * open.
+ * @param {Object} window An object with the id of the window to update, or 0.
+ * @param {string} url The destination URL of the new window.
+ * @return {function()} A function to be called to open the window.
  */
-function openSystemInfoWindow() {
-  if (systemInfoWindowId == 0) {
-    chrome.windows.create({url: 'chrome://system'}, function(win) {
-      systemInfoWindowId = win.id;
-      chrome.app.window.current().show();
-    });
-  } else {
-    chrome.windows.update(systemInfoWindowId, {drawAttention: true});
-  }
+function windowOpener(window, url) {
+  return function() {
+    if (window.id == 0) {
+      chrome.windows.create({url: url}, function(win) {
+        window.id = win.id;
+        chrome.app.window.current().show();
+      });
+    } else {
+      chrome.windows.update(window.id, {drawAttention: true});
+    }
+  };
 }
 
 /**
  * Opens a new window with chrome://slow_trace, downloading performance data.
  */
 function openSlowTraceWindow() {
   chrome.windows.create(
       {url: 'chrome://slow_trace/tracing.zip#' + feedbackInfo.traceId},
       function(win) {});
 }
@@ skipping 18 matching lines @@
   if (!feedbackInfo.attachedFile && attachedFileBlob) {
     feedbackInfo.attachedFile = { name: $('attach-file').value,
                                   data: attachedFileBlob };
   }
 
   feedbackInfo.description = $('description-text').value;
   feedbackInfo.pageUrl = $('page-url-text').value;
   feedbackInfo.email = $('user-email-text').value;
 
   var useSystemInfo = false;
+  var useHistograms = false;
   // On ChromeOS, since we gather System info, check if the user has given his
   // permission for us to send system info.
 <if expr="pp_ifdef('chromeos')">
   if ($('sys-info-checkbox') != null &&
       $('sys-info-checkbox').checked &&
       systemInfo != null) {
-    useSystemInfo = true;
+    // Send histograms along with system info.
+    useSystemInfo = useHistograms = true;
   }
   if ($('performance-info-checkbox') == null ||
       !($('performance-info-checkbox').checked)) {
     feedbackInfo.traceId = null;
   }
 </if>
 
 // On NonChromeOS, we don't have any system information gathered except the
 // Chrome version and the OS version. Hence for Chrome, pass the system info
 // through.
 <if expr="not pp_ifdef('chromeos')">
   if (systemInfo != null)
     useSystemInfo = true;
 </if>
 
   if (useSystemInfo) {
     if (feedbackInfo.systemInformation != null) {
       // Concatenate sysinfo if we had any initial system information
       // sent with the feedback request event.
       feedbackInfo.systemInformation =
           feedbackInfo.systemInformation.concat(systemInfo);
     } else {
       feedbackInfo.systemInformation = systemInfo;
     }
   }
 
+  feedbackInfo.sendHistograms = useHistograms;
+
   // If the user doesn't want to send the screenshot.
   if (!$('screenshot-checkbox').checked)
     feedbackInfo.screenshot = null;
 
   chrome.feedbackPrivate.sendFeedback(feedbackInfo, function(result) {
     window.open(FEEDBACK_LANDING_PAGE, '_blank');
     window.close();
   });
 
   return true;
@@ skipping 100 matching lines @@
         $('performance-info-area').hidden = false;
         $('performance-info-checkbox').checked = true;
         performanceFeedbackChanged();
         $('performance-info-link').onclick = openSlowTraceWindow;
       }
 </if>
 
       chrome.feedbackPrivate.getStrings(function(strings) {
         loadTimeData.data = strings;
         i18nTemplate.process(document, loadTimeData);
+
+        if ($('sys-info-url')) {
+          // Opens a new window showing the current system info.
+          $('sys-info-url').onclick =
+              windowOpener(systemInfoWindow, 'chrome://system');
+        }
+        if ($('histograms-url')) {
+          // Opens a new window showing the histogram metrics.
+          $('histograms-url').onclick =
+              windowOpener(histogramsWindow, 'chrome://histograms');
+        }
       });
     }
   });
 
   window.addEventListener('DOMContentLoaded', function() {
     // TODO(rkc):  Remove logging once crbug.com/284662 is closed.
     console.log('FEEDBACK_DEBUG: feedback.js: DOMContentLoaded');
     // Ready to receive the feedback object.
     chrome.runtime.sendMessage({ready: true});
 
     // Setup our event handlers.
     $('attach-file').addEventListener('change', onFileSelected);
     $('send-report-button').onclick = sendReport;
     $('cancel-button').onclick = cancel;
     $('remove-attached-file').onclick = clearAttachedFile;
 <if expr="pp_ifdef('chromeos')">
     $('performance-info-checkbox').addEventListener(
         'change', performanceFeedbackChanged);
 </if>
 
     chrome.windows.onRemoved.addListener(function(windowId, removeInfo) {
-      if (windowId == systemInfoWindowId)
-        systemInfoWindowId = 0;
+      if (windowId == systemInfoWindow.id)
+        systemInfoWindow.id = 0;
+      else if (windowId == histogramsWindow.id)
+        histogramsWindow.id = 0;
     });
-    if ($('sysinfo-url')) {
-      $('sysinfo-url').onclick = openSystemInfoWindow;
-    }
   });
 }
 
 initialize();