Index: chrome/browser/first_run/first_run_posix.cc |
diff --git a/chrome/browser/first_run/first_run_posix.cc b/chrome/browser/first_run/first_run_posix.cc |
index f71cf8170dc9cf5a1cef080a978363c3a9543540..c80f0242451e55272f9945f38c63508d573c3ef1 100644 |
--- a/chrome/browser/first_run/first_run_posix.cc |
+++ b/chrome/browser/first_run/first_run_posix.cc |
@@ -9,10 +9,6 @@ |
#include "base/utf_string_conversions.h" |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/first_run/first_run_internal.h" |
-#include "chrome/browser/importer/importer_host.h" |
-#include "chrome/browser/importer/importer_list.h" |
-#include "chrome/browser/importer/importer_progress_dialog.h" |
-#include "chrome/browser/importer/importer_progress_observer.h" |
#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/common/chrome_constants.h" |
#include "chrome/common/chrome_paths.h" |
@@ -21,47 +17,6 @@ |
#include "chrome/installer/util/master_preferences.h" |
#include "chrome/installer/util/master_preferences_constants.h" |
-namespace { |
- |
-// This class acts as an observer for the ImporterProgressObserver::ImportEnded |
-// callback. When the import process is started, certain errors may cause |
-// ImportEnded() to be called synchronously, but the typical case is that |
-// ImportEnded() is called asynchronously. Thus we have to handle both cases. |
-class ImportEndedObserver : public importer::ImporterProgressObserver { |
- public: |
- ImportEndedObserver() : ended_(false), |
- should_quit_message_loop_(false) {} |
- virtual ~ImportEndedObserver() {} |
- |
- // importer::ImporterProgressObserver: |
- virtual void ImportStarted() OVERRIDE {} |
- virtual void ImportItemStarted(importer::ImportItem item) OVERRIDE {} |
- virtual void ImportItemEnded(importer::ImportItem item) OVERRIDE {} |
- virtual void ImportEnded() OVERRIDE { |
- ended_ = true; |
- if (should_quit_message_loop_) |
- MessageLoop::current()->Quit(); |
- } |
- |
- void set_should_quit_message_loop() { |
- should_quit_message_loop_ = true; |
- } |
- |
- bool ended() { |
- return ended_; |
- } |
- |
- private: |
- // Set if the import has ended. |
- bool ended_; |
- |
- // Set by the client (via set_should_quit_message_loop) if, when the import |
- // ends, this class should quit the message loop. |
- bool should_quit_message_loop_; |
-}; |
- |
-} // namespace |
- |
namespace first_run { |
namespace internal { |
@@ -87,47 +42,11 @@ bool GetFirstRunSentinelFilePath(base::FilePath* path) { |
return true; |
} |
-bool ImportSettings(Profile* profile, |
- scoped_refptr<ImporterHost> importer_host, |
- scoped_refptr<ImporterList> importer_list, |
- int items_to_import) { |
- const importer::SourceProfile& source_profile = |
- importer_list->GetSourceProfileAt(0); |
- |
- // Ensure that importers aren't requested to import items that they do not |
- // support. If there is no overlap, skip. |
- items_to_import &= source_profile.services_supported; |
- if (items_to_import == 0) |
- return true; |
- |
- scoped_ptr<ImportEndedObserver> observer(new ImportEndedObserver); |
- importer_host->SetObserver(observer.get()); |
- importer_host->StartImportSettings(source_profile, |
- profile, |
- items_to_import, |
- new ProfileWriter(profile), |
- true); |
- // If the import process has not errored out, block on it. |
- if (!observer->ended()) { |
- observer->set_should_quit_message_loop(); |
- MessageLoop::current()->Run(); |
- } |
- |
- // Unfortunately there's no success/fail signal in ImporterHost. |
- return true; |
-} |
- |
-void SetImportPreferencesAndLaunchImport( |
- MasterPrefs* out_prefs, |
- installer::MasterPreferences* install_prefs) { |
- std::string import_bookmarks_path; |
- install_prefs->GetString( |
- installer::master_preferences::kDistroImportBookmarksFromFilePref, |
- &import_bookmarks_path); |
- if (!import_bookmarks_path.empty()) { |
+void SetImportPreferencesAndLaunchImport(MasterPrefs* out_prefs) { |
+ if (!out_prefs->import_bookmarks_path.empty()) { |
// There are bookmarks to import from a file. |
base::FilePath path = base::FilePath::FromWStringHack(UTF8ToWide( |
- import_bookmarks_path)); |
+ out_prefs->import_bookmarks_path)); |
if (!ImportBookmarks(path)) { |
LOG(WARNING) << "silent bookmark import failed"; |
} |