| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/crash/core/browser/crashes_ui_util.h" | 5 #include "components/crash/core/browser/crashes_ui_util.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 {"crashTimeFormat", IDS_CRASH_CRASH_TIME_FORMAT}, | 25 {"crashTimeFormat", IDS_CRASH_CRASH_TIME_FORMAT}, |
| 26 {"crashNotUploaded", IDS_CRASH_CRASH_NOT_UPLOADED}, | 26 {"crashNotUploaded", IDS_CRASH_CRASH_NOT_UPLOADED}, |
| 27 {"crashUserRequested", IDS_CRASH_CRASH_USER_REQUESTED}, | 27 {"crashUserRequested", IDS_CRASH_CRASH_USER_REQUESTED}, |
| 28 {"crashPending", IDS_CRASH_CRASH_PENDING}, | 28 {"crashPending", IDS_CRASH_CRASH_PENDING}, |
| 29 {"crashesTitle", IDS_CRASH_TITLE}, | 29 {"crashesTitle", IDS_CRASH_TITLE}, |
| 30 {"disabledHeader", IDS_CRASH_DISABLED_HEADER}, | 30 {"disabledHeader", IDS_CRASH_DISABLED_HEADER}, |
| 31 {"disabledMessage", IDS_CRASH_DISABLED_MESSAGE}, | 31 {"disabledMessage", IDS_CRASH_DISABLED_MESSAGE}, |
| 32 {"noCrashesMessage", IDS_CRASH_NO_CRASHES_MESSAGE}, | 32 {"noCrashesMessage", IDS_CRASH_NO_CRASHES_MESSAGE}, |
| 33 {"uploadCrashesLinkText", IDS_CRASH_UPLOAD_MESSAGE}, | 33 {"uploadCrashesLinkText", IDS_CRASH_UPLOAD_MESSAGE}, |
| 34 {"uploadNowLinkText", IDS_CRASH_UPLOAD_NOW_LINK_TEXT}, | 34 {"uploadNowLinkText", IDS_CRASH_UPLOAD_NOW_LINK_TEXT}, |
| 35 {"crashSizeMessage", IDS_CRASH_SIZE_MESSAGE}, |
| 35 }; | 36 }; |
| 36 | 37 |
| 37 const size_t kCrashesUILocalizedStringsCount = | 38 const size_t kCrashesUILocalizedStringsCount = |
| 38 arraysize(kCrashesUILocalizedStrings); | 39 arraysize(kCrashesUILocalizedStrings); |
| 39 | 40 |
| 40 const char kCrashesUICrashesJS[] = "crashes.js"; | 41 const char kCrashesUICrashesJS[] = "crashes.js"; |
| 41 const char kCrashesUIRequestCrashList[] = "requestCrashList"; | 42 const char kCrashesUIRequestCrashList[] = "requestCrashList"; |
| 42 const char kCrashesUIRequestCrashUpload[] = "requestCrashUpload"; | 43 const char kCrashesUIRequestCrashUpload[] = "requestCrashUpload"; |
| 43 const char kCrashesUIShortProductName[] = "shortProductName"; | 44 const char kCrashesUIShortProductName[] = "shortProductName"; |
| 44 const char kCrashesUIUpdateCrashList[] = "updateCrashList"; | 45 const char kCrashesUIUpdateCrashList[] = "updateCrashList"; |
| (...skipping 24 matching lines...) Expand all Loading... |
| 69 crash->SetString("id", info.upload_id); | 70 crash->SetString("id", info.upload_id); |
| 70 if (info.state == UploadList::UploadInfo::State::Uploaded) { | 71 if (info.state == UploadList::UploadInfo::State::Uploaded) { |
| 71 crash->SetString("time", | 72 crash->SetString("time", |
| 72 base::TimeFormatFriendlyDateAndTime(info.upload_time)); | 73 base::TimeFormatFriendlyDateAndTime(info.upload_time)); |
| 73 } else { | 74 } else { |
| 74 crash->SetString("time", | 75 crash->SetString("time", |
| 75 base::TimeFormatFriendlyDateAndTime(info.capture_time)); | 76 base::TimeFormatFriendlyDateAndTime(info.capture_time)); |
| 76 } | 77 } |
| 77 crash->SetString("local_id", info.local_id); | 78 crash->SetString("local_id", info.local_id); |
| 78 crash->SetString("state", UploadInfoStateAsString(info.state)); | 79 crash->SetString("state", UploadInfoStateAsString(info.state)); |
| 80 crash->SetString("file_size", info.file_size); |
| 79 out_value->Append(std::move(crash)); | 81 out_value->Append(std::move(crash)); |
| 80 } | 82 } |
| 81 } | 83 } |
| 82 | 84 |
| 83 } // namespace crash | 85 } // namespace crash |
| OLD | NEW |