summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/cocoa/import_settings_dialog.mm2
-rw-r--r--chrome/browser/importer/importer.cc3
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/import_settings_dialog.mm b/chrome/browser/cocoa/import_settings_dialog.mm
index 77fb985..a11244a 100644
--- a/chrome/browser/cocoa/import_settings_dialog.mm
+++ b/chrome/browser/cocoa/import_settings_dialog.mm
@@ -179,7 +179,7 @@ bool importSettingsDialogVisible = false;
int16 servicesToImport = static_cast<int16>(items & [self servicesToImport]);
if (servicesToImport) {
if (profile_) {
- ImporterHost* importerHost = new ImporterHost;
+ ImporterHost* importerHost = new ExternalProcessImporterHost;
// Note that a side effect of the following call is to cause the
// importerHost to be disposed once the import has completed.
StartImportingWithUI(nil, servicesToImport, importerHost,
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index 6c1ce32..fcb8f28 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -340,11 +340,12 @@ void ExternalProcessImporterHost::StartImportSettings(
profile_info_ = &profile_info;
items_ = items;
+ ImporterHost::AddRef(); // Balanced in ImporterHost::ImportEnded.
+
import_to_bookmark_bar_ = ShouldImportToBookmarkBar(first_run);
CheckForFirefoxLock(profile_info, items, first_run);
CheckForLoadedModels(items);
- ImporterHost::AddRef(); // Balanced in ImporterHost::ImportEnded.
InvokeTaskIfDone();
}