chrome/utility/profile_import_handler.cc - Issue 12670013: Out-of-process import on Windows.

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/utility/profile_import_handler.cc

Issue 12670013: Out-of-process import on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Keep Google Toolbar import in-process. Created 7 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:

Index: chrome/utility/profile_import_handler.cc

diff --git a/chrome/utility/profile_import_handler.cc b/chrome/utility/profile_import_handler.cc

index 413feea3bea0166e91c0bee30f171148a31fb4ae..6aec9b98d3b5c63974d96ccd973e05105870159e 100644

--- a/chrome/utility/profile_import_handler.cc

+++ b/chrome/utility/profile_import_handler.cc

@@ -49,9 +49,10 @@ void ProfileImportHandler::OnImportStart(

// Create worker thread in which importer runs.

import_thread_.reset(new base::Thread("import_thread"));

- base::Thread::Options options;

- options.message_loop_type = MessageLoop::TYPE_IO;

- if (!import_thread_->StartWithOptions(options)) {

+#if defined(OS_WIN)

+ import_thread_->init_com_with_mta(false);

+#endif

+ if (!import_thread_->Start()) {

NOTREACHED();

ImporterCleanup();

}