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 |
11 #include "base/i18n/time_formatting.h" | 11 #include "base/i18n/time_formatting.h" |
12 #include "base/macros.h" | 12 #include "base/macros.h" |
13 #include "base/strings/string_number_conversions.h" | |
13 #include "base/values.h" | 14 #include "base/values.h" |
14 #include "components/upload_list/upload_list.h" | 15 #include "components/upload_list/upload_list.h" |
15 #include "grit/components_chromium_strings.h" | 16 #include "grit/components_chromium_strings.h" |
16 #include "grit/components_strings.h" | 17 #include "grit/components_strings.h" |
17 | 18 |
18 namespace crash { | 19 namespace crash { |
19 | 20 |
20 const CrashesUILocalizedString kCrashesUILocalizedStrings[] = { | 21 const CrashesUILocalizedString kCrashesUILocalizedStrings[] = { |
21 {"bugLinkText", IDS_CRASH_BUG_LINK_LABEL}, | 22 {"bugLinkText", IDS_CRASH_BUG_LINK_LABEL}, |
22 {"crashCountFormat", IDS_CRASH_CRASH_COUNT_BANNER_FORMAT}, | 23 {"crashCountFormat", IDS_CRASH_CRASH_COUNT_BANNER_FORMAT}, |
23 {"crashHeaderFormat", IDS_CRASH_CRASH_HEADER_FORMAT}, | 24 {"crashHeaderFormat", IDS_CRASH_CRASH_HEADER_FORMAT}, |
24 {"crashHeaderFormatLocalOnly", IDS_CRASH_CRASH_HEADER_FORMAT_LOCAL_ONLY}, | 25 {"crashHeaderFormatLocalOnly", IDS_CRASH_CRASH_HEADER_FORMAT_LOCAL_ONLY}, |
25 {"crashTimeFormat", IDS_CRASH_CRASH_TIME_FORMAT}, | 26 {"crashTimeFormat", IDS_CRASH_CRASH_TIME_FORMAT}, |
26 {"crashNotUploaded", IDS_CRASH_CRASH_NOT_UPLOADED}, | 27 {"crashNotUploaded", IDS_CRASH_CRASH_NOT_UPLOADED}, |
27 {"crashUserRequested", IDS_CRASH_CRASH_USER_REQUESTED}, | 28 {"crashUserRequested", IDS_CRASH_CRASH_USER_REQUESTED}, |
28 {"crashPending", IDS_CRASH_CRASH_PENDING}, | 29 {"crashPending", IDS_CRASH_CRASH_PENDING}, |
29 {"crashesTitle", IDS_CRASH_TITLE}, | 30 {"crashesTitle", IDS_CRASH_TITLE}, |
30 {"disabledHeader", IDS_CRASH_DISABLED_HEADER}, | 31 {"disabledHeader", IDS_CRASH_DISABLED_HEADER}, |
31 {"disabledMessage", IDS_CRASH_DISABLED_MESSAGE}, | 32 {"disabledMessage", IDS_CRASH_DISABLED_MESSAGE}, |
32 {"noCrashesMessage", IDS_CRASH_NO_CRASHES_MESSAGE}, | 33 {"noCrashesMessage", IDS_CRASH_NO_CRASHES_MESSAGE}, |
33 {"uploadCrashesLinkText", IDS_CRASH_UPLOAD_MESSAGE}, | 34 {"uploadCrashesLinkText", IDS_CRASH_UPLOAD_MESSAGE}, |
34 {"uploadNowLinkText", IDS_CRASH_UPLOAD_NOW_LINK_TEXT}, | 35 {"uploadNowLinkText", IDS_CRASH_UPLOAD_NOW_LINK_TEXT}, |
36 {"crashSizeMessage", IDS_CRASH_SIZE_MESSAGE}, | |
35 }; | 37 }; |
36 | 38 |
37 const size_t kCrashesUILocalizedStringsCount = | 39 const size_t kCrashesUILocalizedStringsCount = |
38 arraysize(kCrashesUILocalizedStrings); | 40 arraysize(kCrashesUILocalizedStrings); |
39 | 41 |
40 const char kCrashesUICrashesJS[] = "crashes.js"; | 42 const char kCrashesUICrashesJS[] = "crashes.js"; |
41 const char kCrashesUIRequestCrashList[] = "requestCrashList"; | 43 const char kCrashesUIRequestCrashList[] = "requestCrashList"; |
42 const char kCrashesUIRequestCrashUpload[] = "requestCrashUpload"; | 44 const char kCrashesUIRequestCrashUpload[] = "requestCrashUpload"; |
43 const char kCrashesUIShortProductName[] = "shortProductName"; | 45 const char kCrashesUIShortProductName[] = "shortProductName"; |
44 const char kCrashesUIUpdateCrashList[] = "updateCrashList"; | 46 const char kCrashesUIUpdateCrashList[] = "updateCrashList"; |
(...skipping 24 matching lines...) Expand all Loading... | |
69 crash->SetString("id", info.upload_id); | 71 crash->SetString("id", info.upload_id); |
70 if (info.state == UploadList::UploadInfo::State::Uploaded) { | 72 if (info.state == UploadList::UploadInfo::State::Uploaded) { |
71 crash->SetString("time", | 73 crash->SetString("time", |
72 base::TimeFormatFriendlyDateAndTime(info.upload_time)); | 74 base::TimeFormatFriendlyDateAndTime(info.upload_time)); |
73 } else { | 75 } else { |
74 crash->SetString("time", | 76 crash->SetString("time", |
75 base::TimeFormatFriendlyDateAndTime(info.capture_time)); | 77 base::TimeFormatFriendlyDateAndTime(info.capture_time)); |
76 } | 78 } |
77 crash->SetString("local_id", info.local_id); | 79 crash->SetString("local_id", info.local_id); |
78 crash->SetString("state", UploadInfoStateAsString(info.state)); | 80 crash->SetString("state", UploadInfoStateAsString(info.state)); |
81 crash->SetString("file_size", info.file_size == 0 | |
Mark Mentovai
2016/09/13 16:13:25
A crash report’s might accidentally wind up as 0 b
gayane -on leave until 09-2017
2016/09/13 17:40:23
Done.
| |
82 ? "" | |
83 : base::IntToString(info.file_size)); | |
79 out_value->Append(std::move(crash)); | 84 out_value->Append(std::move(crash)); |
80 } | 85 } |
81 } | 86 } |
82 | 87 |
83 } // namespace crash | 88 } // namespace crash |
OLD | NEW |