mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
29ced1215a
* chore: bump chromium in DEPS to 111.0.5563.19 * chore: bump chromium in DEPS to 111.0.5563.33 * chore: bump chromium in DEPS to 111.0.5563.41 * chore: update patches * refactor: remove GetFontLookupTableCacheDir Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4191820 (cherry picked from commit52740f127f) * chore: remove dead DecodeToken code (cherry picked from commite7ac425771) * chore: add stub impls for WCO routing Refs: https://chromium-review.googlesource.com/c/chromium/src/+/4182690 (cherry picked from commit911e353b07) * refacotr: switch mojom::NetworkHintsHandler to use SchemeHostPair instead of URL Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4185417 (cherry picked from commita8b3befdd7) * chore: bump chromium in DEPS to 111.0.5563.50 * chore: update patches * 4240360: [intl] Revert date formatting behavior change from ICU 72 https://chromium-review.googlesource.com/c/v8/v8/+/4240360 * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
39 lines
1.7 KiB
Diff
39 lines
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 0d07e156e7d44c55ac47a525863da7d514b24001..272956518929f1729456c842d579edf42ef5160b 100644
|
|
--- a/components/upload_list/upload_list.cc
|
|
+++ b/components/upload_list/upload_list.cc
|
|
@@ -65,6 +65,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 bb1655f85538fd4b4a513e1f87f9411bf879f71c..9919b0ff5785667c5fd8f81d64eeb2e87b7b9abc 100644
|
|
--- a/components/upload_list/upload_list.h
|
|
+++ b/components/upload_list/upload_list.h
|
|
@@ -80,6 +80,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,
|