зеркало из https://github.com/electron/electron.git
39 строки
1.7 KiB
Diff
39 строки
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Apthorp <jeremya@chromium.org>
|
|
Date: Fri, 1 May 2020 18:25:59 -0700
|
|
Subject: upload_list: add LoadSync method
|
|
|
|
This allows synchronous loading of the upload list, which is required by
|
|
the crashReporter.getUploadedReports() API. The synchronous version is
|
|
deprecated, and this API should be removed once the deprecated behavior
|
|
is no longer supported.
|
|
|
|
diff --git a/components/upload_list/upload_list.cc b/components/upload_list/upload_list.cc
|
|
index da283af7c483beae96a0afde494ce24628e909c8..75fb0d0b019979186f9f6b34b72d96d39eb146f0 100644
|
|
--- a/components/upload_list/upload_list.cc
|
|
+++ b/components/upload_list/upload_list.cc
|
|
@@ -72,6 +72,10 @@ void UploadList::Load(base::OnceClosure callback) {
|
|
base::BindOnce(&UploadList::OnLoadComplete, this));
|
|
}
|
|
|
|
+void UploadList::LoadSync() {
|
|
+ uploads_ = LoadUploadList();
|
|
+}
|
|
+
|
|
void UploadList::Clear(const base::Time& begin,
|
|
const base::Time& end,
|
|
base::OnceClosure callback) {
|
|
diff --git a/components/upload_list/upload_list.h b/components/upload_list/upload_list.h
|
|
index 9acfd8190484637630486bfdc654d25ff6a371b0..b9025804deca8c90969120ba05faa69110eef1d2 100644
|
|
--- a/components/upload_list/upload_list.h
|
|
+++ b/components/upload_list/upload_list.h
|
|
@@ -77,6 +77,8 @@ class UploadList : public base::RefCountedThreadSafe<UploadList> {
|
|
// overwrite the previously supplied one, and the first will not be called.
|
|
void Load(base::OnceClosure callback);
|
|
|
|
+ void LoadSync();
|
|
+
|
|
// Clears any data associated with the upload list, where the upload time or
|
|
// capture time falls within the given range.
|
|
void Clear(const base::Time& begin,
|