Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1962)

Unified Diff: chrome/browser/extensions/extension_garbage_collector.cc

Issue 1890163004: extensions: Abstract out install delay strategy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: for comments in #4 Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_garbage_collector.cc
diff --git a/chrome/browser/extensions/extension_garbage_collector.cc b/chrome/browser/extensions/extension_garbage_collector.cc
index e24e5ad0247a3a81cb34854140b10ac78fb29975..efc39846548bc9fd5333299fd3fa221469c1fc26 100644
--- a/chrome/browser/extensions/extension_garbage_collector.cc
+++ b/chrome/browser/extensions/extension_garbage_collector.cc
@@ -234,13 +234,22 @@ void ExtensionGarbageCollector::GarbageCollectIsolatedStorageIfNeeded() {
}
}
- ExtensionService* service =
- ExtensionSystem::Get(context_)->extension_service();
- service->OnGarbageCollectIsolatedStorageStart();
+ DCHECK(!installs_delayed_for_gc_);
+ installs_delayed_for_gc_ = true;
content::BrowserContext::GarbageCollectStoragePartitions(
context_, std::move(active_paths),
- base::Bind(&ExtensionService::OnGarbageCollectIsolatedStorageFinished,
- service->AsWeakPtr()));
+ base::Bind(
+ &ExtensionGarbageCollector::OnGarbageCollectIsolatedStorageFinished,
+ weak_factory_.GetWeakPtr()));
+}
+
+void ExtensionGarbageCollector::OnGarbageCollectIsolatedStorageFinished() {
+ DCHECK(installs_delayed_for_gc_);
+ installs_delayed_for_gc_ = false;
+
+ ExtensionSystem::Get(context_)
+ ->extension_service()
+ ->MaybeFinishDelayedInstallations();
}
void ExtensionGarbageCollector::OnBeginCrxInstall(
@@ -263,4 +272,10 @@ void ExtensionGarbageCollector::OnFinishCrxInstall(
}
}
+InstallGate::Action ExtensionGarbageCollector::ShouldDelay(
+ const Extension* extension,
+ bool install_immediately) {
+ return installs_delayed_for_gc_ ? DELAY : INSTALL;
+}
+
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698