Chromium Code Reviews| Index: components/crash/core/browser/crashes_ui_util.cc |
| diff --git a/components/crash/core/browser/crashes_ui_util.cc b/components/crash/core/browser/crashes_ui_util.cc |
| index d99b5b3e60f14d28360548814b01a597319a23aa..11eb255bb24e16b2e483f4d77463b6c5c9c8a4f8 100644 |
| --- a/components/crash/core/browser/crashes_ui_util.cc |
| +++ b/components/crash/core/browser/crashes_ui_util.cc |
| @@ -23,6 +23,8 @@ const CrashesUILocalizedString kCrashesUILocalizedStrings[] = { |
| {"crashCountFormat", IDS_CRASH_CRASH_COUNT_BANNER_FORMAT}, |
| {"crashHeaderFormat", IDS_CRASH_CRASH_HEADER_FORMAT}, |
| {"crashTimeFormat", IDS_CRASH_CRASH_TIME_FORMAT}, |
| + {"crashNotUploaded", IDS_CRASH_CRASH_NOT_UPLOADED}, |
| + {"crashPendingUpload", IDS_CRASH_CRASH_PENDING_UPLOAD}, |
| {"crashesTitle", IDS_CRASH_TITLE}, |
| {"disabledHeader", IDS_CRASH_DISABLED_HEADER}, |
| {"disabledMessage", IDS_CRASH_DISABLED_MESSAGE}, |
| @@ -39,6 +41,18 @@ const char kCrashesUIRequestCrashUpload[] = "requestCrashUpload"; |
| const char kCrashesUIShortProductName[] = "shortProductName"; |
| const char kCrashesUIUpdateCrashList[] = "updateCrashList"; |
| +std::string UploadInfoStateAsString(UploadList::UploadInfo::State state) { |
| + switch (state) { |
| + case UploadList::UploadInfo::State::NotUploaded: |
| + return "not_uploaded"; |
| + case UploadList::UploadInfo::State::Pending: |
| + return "pending"; |
| + default: // Fall through. |
|
Mark Mentovai
2016/06/20 17:55:21
I think we don’t want this “default” either.
scottmg
2016/06/20 21:08:55
Done (same).
|
| + case UploadList::UploadInfo::State::Uploaded: |
| + return "uploaded"; |
| + } |
| +} |
| + |
| void UploadListToValue(UploadList* upload_list, base::ListValue* out_value) { |
| std::vector<UploadList::UploadInfo> crashes; |
| upload_list->GetUploads(50, &crashes); |
| @@ -49,6 +63,7 @@ void UploadListToValue(UploadList* upload_list, base::ListValue* out_value) { |
| crash->SetString("time", |
| base::TimeFormatFriendlyDateAndTime(info.upload_time)); |
| crash->SetString("local_id", info.local_id); |
| + crash->SetString("state", UploadInfoStateAsString(info.state)); |
| out_value->Append(std::move(crash)); |
| } |
| } |