chrome/browser/first_run/first_run_win.cc - Issue 11572036: Do not load extension system in the Profile import process.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/first_run/first_run_win.cc

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: comment about test-only function 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:

Index: chrome/browser/first_run/first_run_win.cc

diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc

index 8c8707ffbb35ce7dea430be55b96532a040aaf0c..09c56b2cd08e6df985816fe446cc40e7f4f41fba 100644

--- a/chrome/browser/first_run/first_run_win.cc

+++ b/chrome/browser/first_run/first_run_win.cc

@@ -338,6 +338,9 @@ bool ImportSettingsWin(Profile* profile,

import_cmd.AppendSwitchASCII(switches::kLang,

g_browser_process->GetApplicationLocale());

+ // Always run BrowserMain, even in tests.

+ import_cmd.AppendSwitch(switches::kLaunchAsBrowser);

if (items_to_import) {

import_cmd.AppendSwitchASCII(switches::kImport,

EncodeImportParams(importer_type, items_to_import, skip_first_run_ui));