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

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

Issue 17296003: Remove import process workarounds from ExtensionService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback, more workarounds removed Created 7 years, 6 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_system.cc
diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc
index a2ae1f3f054965ca651a133396600550b914b546..c65ec5379fb0d454f54a162b361b3487e8f2e00e 100644
--- a/chrome/browser/extensions/extension_system.cc
+++ b/chrome/browser/extensions/extension_system.cc
@@ -204,14 +204,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
// initialized (see issue 40144). Now that bookmarks aren't imported and
// the event routers need to be initialized for every profile individually,
// initialize them with the extension service.
- // If import is going to run in a separate process (the profile itself is on
- // the main process), wait for import to finish before initializing the
- // routers.
- if (g_browser_process->profile_manager()->will_import()) {
- extension_service_->InitEventRoutersAfterImport();
- } else {
- extension_service_->InitEventRouters();
- }
+ extension_service_->InitEventRouters();
extension_warning_service_.reset(new ExtensionWarningService(profile_));
extension_warning_badge_service_.reset(

Powered by Google App Engine
This is Rietveld 408576698