| 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> |
| 8 #include <utility> |
| 7 #include <vector> | 9 #include <vector> |
| 8 | 10 |
| 9 #include "base/i18n/time_formatting.h" | 11 #include "base/i18n/time_formatting.h" |
| 10 #include "base/macros.h" | 12 #include "base/macros.h" |
| 11 #include "base/values.h" | 13 #include "base/values.h" |
| 12 #include "components/upload_list/upload_list.h" | 14 #include "components/upload_list/upload_list.h" |
| 13 #include "grit/components_chromium_strings.h" | 15 #include "grit/components_chromium_strings.h" |
| 14 #include "grit/components_google_chrome_strings.h" | 16 #include "grit/components_google_chrome_strings.h" |
| 15 #include "grit/components_strings.h" | 17 #include "grit/components_strings.h" |
| 16 | 18 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 35 const char kCrashesUIRequestCrashList[] = "requestCrashList"; | 37 const char kCrashesUIRequestCrashList[] = "requestCrashList"; |
| 36 const char kCrashesUIRequestCrashUpload[] = "requestCrashUpload"; | 38 const char kCrashesUIRequestCrashUpload[] = "requestCrashUpload"; |
| 37 const char kCrashesUIShortProductName[] = "shortProductName"; | 39 const char kCrashesUIShortProductName[] = "shortProductName"; |
| 38 const char kCrashesUIUpdateCrashList[] = "updateCrashList"; | 40 const char kCrashesUIUpdateCrashList[] = "updateCrashList"; |
| 39 | 41 |
| 40 void UploadListToValue(UploadList* upload_list, base::ListValue* out_value) { | 42 void UploadListToValue(UploadList* upload_list, base::ListValue* out_value) { |
| 41 std::vector<UploadList::UploadInfo> crashes; | 43 std::vector<UploadList::UploadInfo> crashes; |
| 42 upload_list->GetUploads(50, &crashes); | 44 upload_list->GetUploads(50, &crashes); |
| 43 | 45 |
| 44 for (const auto& info : crashes) { | 46 for (const auto& info : crashes) { |
| 45 base::DictionaryValue* crash = new base::DictionaryValue(); | 47 std::unique_ptr<base::DictionaryValue> crash(new base::DictionaryValue()); |
| 46 crash->SetString("id", info.upload_id); | 48 crash->SetString("id", info.upload_id); |
| 47 crash->SetString("time", | 49 crash->SetString("time", |
| 48 base::TimeFormatFriendlyDateAndTime(info.upload_time)); | 50 base::TimeFormatFriendlyDateAndTime(info.upload_time)); |
| 49 crash->SetString("local_id", info.local_id); | 51 crash->SetString("local_id", info.local_id); |
| 50 out_value->Append(crash); | 52 out_value->Append(std::move(crash)); |
| 51 } | 53 } |
| 52 } | 54 } |
| 53 | 55 |
| 54 } // namespace crash | 56 } // namespace crash |
| OLD | NEW |