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

Unified Diff: chrome/browser/ui/webui/options/import_data_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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options/import_data_handler.cc
diff --git a/chrome/browser/ui/webui/options/import_data_handler.cc b/chrome/browser/ui/webui/options/import_data_handler.cc
index 5b2d449ce5ab7de409e5d62b209fc1f5ab357409..bd83ce192b7914ea5321d7ec0d46e61ae06f128f 100644
--- a/chrome/browser/ui/webui/options/import_data_handler.cc
+++ b/chrome/browser/ui/webui/options/import_data_handler.cc
@@ -109,12 +109,15 @@ void ImportDataHandler::ImportData(const ListValue* args) {
state);
import_did_succeed_ = false;
- // TODO(csilv): Out-of-process import has only been qualified on MacOS X,
- // so we will only use it on that platform since it is required. Remove this
- // conditional logic once oop import is qualified for Linux/Windows.
- // http://crbug.com/22142
-#if defined(OS_MACOSX)
- importer_host_ = new ExternalProcessImporterHost;
+ // TODO(gab): Make Linux use OOP import as well (http://crbug.com/56816) and
+ // get rid of these ugly ifdefs.
+#if defined(OS_MACOSX) || defined(OS_WIN)
+ // The Google Toolbar import doesn't work for the out-of-process import.
Nico 2013/04/29 03:24:54 Maybe call out that Google Toolbar import never ru
gab 2013/04/29 12:41:53 Done.
+ // See discussion on http://crbug.com/219419 for details.
+ if (source_profile.importer_type == importer::TYPE_GOOGLE_TOOLBAR5)
+ importer_host_ = new ImporterHost;
+ else
+ importer_host_ = new ExternalProcessImporterHost;
#else
importer_host_ = new ImporterHost;
#endif
« no previous file with comments | « chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698