76c5f5cc8aIn the GN build, libchromiumcontent is no longer a distinct library, but merely a container for a set of scripts and patches. Maintaining those patches in a separate repository is tedious and error-prone, so merge them into the main repo. Once this is merged and GN is the default way to build Electron, the libchromiumcontent repository can be archived.
23 lines
1 KiB
Diff
23 lines
1 KiB
Diff
diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc
|
|
index 2417abcfdae2..13a06d02e012 100644
|
|
--- a/content/browser/service_worker/service_worker_version.cc
|
|
+++ b/content/browser/service_worker/service_worker_version.cc
|
|
@@ -53,9 +53,6 @@
|
|
#include "third_party/WebKit/public/web/WebConsoleMessage.h"
|
|
|
|
namespace content {
|
|
-
|
|
-using StatusCallback = ServiceWorkerVersion::StatusCallback;
|
|
-
|
|
namespace {
|
|
|
|
// Timeout for an installed worker to start.
|
|
@@ -103,7 +100,7 @@ void RunCallbacks(ServiceWorkerVersion* version,
|
|
|
|
// An adapter to run a |callback| after StartWorker.
|
|
void RunCallbackAfterStartWorker(base::WeakPtr<ServiceWorkerVersion> version,
|
|
- StatusCallback callback,
|
|
+ ServiceWorkerVersion::StatusCallback callback,
|
|
ServiceWorkerStatusCode status) {
|
|
if (status == SERVICE_WORKER_OK &&
|
|
version->running_status() != EmbeddedWorkerStatus::RUNNING) {
|