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

Unified Diff: chrome/browser/extensions/component_loader.h

Issue 11572036: Do not load extension system in the Profile import process. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: resolve possible database conflicts in the browser process Created 8 years 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/component_loader.h
diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h
index 02798b31b01616aacd5dc612546214c6831aee61..4b51dc4c8d1cee13f1b8adcdc6c08bb4fd664cbe 100644
--- a/chrome/browser/extensions/component_loader.h
+++ b/chrome/browser/extensions/component_loader.h
@@ -32,8 +32,12 @@ class ComponentLoader {
return component_extensions_.size();
}
- // Loads any registered component extensions.
- void LoadAll();
+ // Loads registered component extensions. Extensions with background pages
+ // will be deferred until LoadDeferred if the argument is true.
Yoyo Zhou 2012/12/19 21:50:38 LoadAllDeferred
tapted 2012/12/19 22:58:24 Done.
+ void LoadAll(bool defer_extensions_with_background_pages);
Yoyo Zhou 2012/12/19 21:50:38 Reading LoadAll(false) in the code isn't very self
tapted 2012/12/19 22:58:24 Done. I went with - BulkLoadAll - BulkLoadDeferBac
+
+ // Load component extensions deferred in the last call to LoadAll(true).
+ void LoadAllDeferred();
// Clear the list of all registered extensions and unloads them from the
// extension service.
@@ -111,7 +115,8 @@ class ComponentLoader {
const FilePath& root_directory);
// Loads a registered component extension.
- const Extension* Load(const ComponentExtensionInfo& info);
+ void Load(const ComponentExtensionInfo& info,
tapted 2012/12/19 13:19:14 (note: return type changed to void - nothing used
+ bool defer_if_has_background_page);
void AddDefaultComponentExtensionsWithBackgroundPages(
bool skip_session_components);
@@ -140,6 +145,10 @@ class ComponentLoader {
PrefChangeRegistrar pref_change_registrar_;
+ // Extensions with background pages deferred by LoadAll(true).
+ typedef std::vector<scoped_refptr<const Extension> > DeferredAtLoadExtensions;
+ DeferredAtLoadExtensions deferred_at_load_extensions;
+
DISALLOW_COPY_AND_ASSIGN(ComponentLoader);
};

Powered by Google App Engine
This is Rietveld 408576698