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

Side by Side Diff: trunk/src/chrome/utility/profile_import_handler.cc

Issue 15968002: 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « trunk/src/chrome/common/switch_utils_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/utility/profile_import_handler.h" 5 #include "chrome/utility/profile_import_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/message_loop/message_loop_proxy.h" 9 #include "base/message_loop/message_loop_proxy.h"
10 #include "base/threading/thread.h" 10 #include "base/threading/thread.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 if (!importer_) { 42 if (!importer_) {
43 Send(new ProfileImportProcessHostMsg_Import_Finished(false, 43 Send(new ProfileImportProcessHostMsg_Import_Finished(false,
44 "Importer could not be created.")); 44 "Importer could not be created."));
45 return; 45 return;
46 } 46 }
47 47
48 items_to_import_ = items; 48 items_to_import_ = items;
49 49
50 // Create worker thread in which importer runs. 50 // Create worker thread in which importer runs.
51 import_thread_.reset(new base::Thread("import_thread")); 51 import_thread_.reset(new base::Thread("import_thread"));
52 #if defined(OS_WIN) 52 base::Thread::Options options;
53 import_thread_->init_com_with_mta(false); 53 options.message_loop_type = base::MessageLoop::TYPE_IO;
54 #endif 54 if (!import_thread_->StartWithOptions(options)) {
55 if (!import_thread_->Start()) {
56 NOTREACHED(); 55 NOTREACHED();
57 ImporterCleanup(); 56 ImporterCleanup();
58 } 57 }
59 import_thread_->message_loop()->PostTask( 58 import_thread_->message_loop()->PostTask(
60 FROM_HERE, base::Bind(&Importer::StartImport, importer_.get(), 59 FROM_HERE, base::Bind(&Importer::StartImport, importer_.get(),
61 source_profile, items, bridge_)); 60 source_profile, items, bridge_));
62 } 61 }
63 62
64 void ProfileImportHandler::OnImportCancel() { 63 void ProfileImportHandler::OnImportCancel() {
65 ImporterCleanup(); 64 ImporterCleanup();
(...skipping 15 matching lines...) Expand all
81 import_thread_.reset(); 80 import_thread_.reset();
82 content::UtilityThread::Get()->ReleaseProcessIfNeeded(); 81 content::UtilityThread::Get()->ReleaseProcessIfNeeded();
83 } 82 }
84 83
85 // static 84 // static
86 bool ProfileImportHandler::Send(IPC::Message* message) { 85 bool ProfileImportHandler::Send(IPC::Message* message) {
87 return content::UtilityThread::Get()->Send(message); 86 return content::UtilityThread::Get()->Send(message);
88 } 87 }
89 88
90 } // namespace chrome 89 } // namespace chrome
OLDNEW
« no previous file with comments | « trunk/src/chrome/common/switch_utils_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698