Manual crash uploads for mac and win

components/crash/core/browser/resources/crashes.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.
 
 /* Id for tracking automatic refresh of crash list.  */
 var refreshCrashListId = undefined;
 
 /**
  * Requests the list of crashes from the backend.
  */
 function requestCrashes() {
   chrome.send('requestCrashList');
 }
 
 /**
  * Callback from backend with the list of crashes. Builds the UI.
  * @param {boolean} enabled Whether or not crash reporting is enabled.
  * @param {boolean} dynamicBackend Whether the crash backend is dynamic.
+ * @param {boolean} manualUploads Whether the manual uploads are supported.
  * @param {array} crashes The list of crashes.
  * @param {string} version The browser version.
  * @param {string} os The OS name and version.
  */
-function updateCrashList(enabled, dynamicBackend, crashes, version, os) {
+function updateCrashList(
+    enabled, dynamicBackend, manualUploads,
+    crashes, version, os) {
   $('countBanner').textContent =
       loadTimeData.getStringF('crashCountFormat',
                               crashes.length.toLocaleString());
 
   var crashSection = $('crashList');
 
-  $('enabledMode').hidden = !enabled;
   $('disabledMode').hidden = enabled;
   $('crashUploadStatus').hidden = !enabled || !dynamicBackend;
 
-  if (!enabled)
-    return;
-
   // Clear any previous list.
   crashSection.textContent = '';
 
   var productName = loadTimeData.getString('shortProductName');
 
   for (var i = 0; i < crashes.length; i++) {
     var crash = crashes[i];
     if (crash['local_id'] == '')
       crash['local_id'] = productName;
 
@@ skipping 48 matching lines @@
       };
       var href = 'https://code.google.com/p/chromium/issues/entry';
       for (var param in params) {
         href = appendParam(href, param, params[param]);
       }
       link.href = href;
       link.target = '_blank';
       link.textContent = loadTimeData.getString('bugLinkText');
       linkBlock.appendChild(link);
       crashBlock.appendChild(linkBlock);
-    } else if (crash['state'] == 'pending') {
-      var pending = document.createElement('p');
-      pending.textContent = loadTimeData.getStringF('crashPending',
-                                                    crash['time']);
-      crashBlock.appendChild(pending);
-    } else if (crash['state'] == 'not_uploaded') {
-      var not_uploaded = document.createElement('p');
-      not_uploaded.textContent = loadTimeData.getStringF('crashNotUploaded',
-                                                         crash['time']);
-      crashBlock.appendChild(not_uploaded);
+    } else if (crash['state'] == 'pending_user_requested') {
+        var user_requested = document.createElement('p');
+        user_requested.textContent =
+            loadTimeData.getStringF('crashUserRequested', crash['time']);
+        crashBlock.appendChild(user_requested);
+    } else {
+      if (crash['state'] == 'pending') {
+        var pending = document.createElement('p');
+        pending.textContent = loadTimeData.getStringF('crashPending',
+                                                      crash['time']);
+        crashBlock.appendChild(pending);
+      } else if (crash['state'] == 'not_uploaded') {
+        var not_uploaded = document.createElement('p');
+        not_uploaded.textContent = loadTimeData.getStringF('crashNotUploaded',
+                                                           crash['time']);
+        crashBlock.appendChild(not_uploaded);
+      }
+
+      if (manualUploads) {
+        var uploadNowLinkBlock = document.createElement('p');
+        var link = document.createElement('a');
+        link.href = '';
+        link.textContent = loadTimeData.getString('uploadNowLinkText');
+        link['local_id'] = crash['local_id'];
+        link.onclick = function() {
+          chrome.send('requestSingleCrashUpload', [this['local_id']]);
+        }
+        uploadNowLinkBlock.appendChild(link);
+        crashBlock.appendChild(uploadNowLinkBlock)
+      }
     }
     crashSection.appendChild(crashBlock);
   }
 
   $('noCrashes').hidden = crashes.length != 0;
 }
 
 /**
  * Request crashes get uploaded in the background.
  */
 function requestCrashUpload() {
   // Don't need locking with this call because the system crash reporter
   // has locking built into itself.
   chrome.send('requestCrashUpload');
 
   // Trigger a refresh in 5 seconds.  Clear any previous requests.
   clearTimeout(refreshCrashListId);
   refreshCrashListId = setTimeout(requestCrashes, 5000);
 }
 
 document.addEventListener('DOMContentLoaded', function() {
   $('uploadCrashes').onclick = requestCrashUpload;
   requestCrashes();
-});
+});