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

Unified Diff: trunk/src/chrome/browser/extensions/extension_service.cc

Issue 15876003: Revert 201968 "Revert 201837 "OOP import on Windows."" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 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: trunk/src/chrome/browser/extensions/extension_service.cc
===================================================================
--- trunk/src/chrome/browser/extensions/extension_service.cc (revision 201976)
+++ trunk/src/chrome/browser/extensions/extension_service.cc (working copy)
@@ -410,7 +410,6 @@
g_browser_process->local_state()));
if (extensions_enabled_) {
- CHECK(!ProfileManager::IsImportProcess(*command_line));
extensions::ExternalProviderImpl::CreateExternalProviders(
this, profile_, &external_extension_providers_);
}
@@ -566,9 +565,6 @@
DCHECK_EQ(extensions_.size(), 0u);
const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
-
- CHECK(!ProfileManager::IsImportProcess(*cmd_line));
-
if (cmd_line->HasSwitch(switches::kInstallFromWebstore) ||
cmd_line->HasSwitch(switches::kLimitedInstallFromWebstore)) {
// The sole purpose of this launch is to install a new extension from CWS
« no previous file with comments | « trunk/src/chrome/browser/chrome_browser_main.cc ('k') | trunk/src/chrome/browser/extensions/extension_system.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698