Index: components/crash/core/browser/resources/crashes.js |
diff --git a/components/crash/core/browser/resources/crashes.js b/components/crash/core/browser/resources/crashes.js |
index edb71fb9b1ca45ba49cc2a8c3ccfd528257b79c2..8894d32fdc77227d571f5b8dbc77514b6af790c9 100644 |
--- a/components/crash/core/browser/resources/crashes.js |
+++ b/components/crash/core/browser/resources/crashes.js |
@@ -101,23 +101,30 @@ function updateCrashList( |
link.textContent = loadTimeData.getString('bugLinkText'); |
linkBlock.appendChild(link); |
crashBlock.appendChild(linkBlock); |
- } else if (crash.state == 'pending_user_requested') { |
- var userRequested = document.createElement('p'); |
- userRequested.textContent = |
- loadTimeData.getStringF('crashUserRequested', crash.time); |
- crashBlock.appendChild(userRequested); |
- } else if (crash.state == 'pending' || crash.state == 'not_uploaded') { |
- if (crash.state == 'pending') |
+ } else { |
+ if (crash.state == 'pending_user_requested') |
+ var textContentKey = 'crashUserRequested'; |
+ else if (crash.state == 'pending') |
var textContentKey = 'crashPending'; |
- else |
+ else if (crash.state == 'not_uploaded') |
var textContentKey = 'crashNotUploaded'; |
+ else |
+ continue; |
- var notUploaded = document.createElement('p'); |
- notUploaded.textContent = loadTimeData.getStringF(textContentKey, |
- crash.time); |
- crashBlock.appendChild(notUploaded); |
+ var crashText = document.createElement('p'); |
+ crashText.textContent = loadTimeData.getStringF(textContentKey, |
+ crash.time); |
+ crashBlock.appendChild(crashText); |
+ |
+ if (crash.file_size != '') { |
+ var crashSizeText = document.createElement('p'); |
+ crashSizeText.textContent = loadTimeData.getStringF('crashSizeMessage', |
+ crash.file_size); |
+ crashBlock.appendChild(crashSizeText); |
+ } |
- if (manualUploads) { |
+ // Do not show "Send now" link for already requested crashes. |
+ if (crash.state != 'pending_user_requested' && manualUploads) { |
var uploadNowLinkBlock = document.createElement('p'); |
var link = document.createElement('a'); |
link.href = ''; |
@@ -152,4 +159,4 @@ function requestCrashUpload() { |
document.addEventListener('DOMContentLoaded', function() { |
$('uploadCrashes').onclick = requestCrashUpload; |
requestCrashes(); |
-}); |
+}); |