diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-22 16:42:07 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-22 16:42:07 +0000 |
| commit | 80a9966966b76bba436398ca529f9e4d509d5aab (patch) | |
| tree | 11aec759e5dde6a0ae4b9262c557c90205e27690 /chrome/browser/first_run_win.cc | |
| parent | a37bd9baafb3ccc1532b77db9df922d35a10e2f3 (diff) | |
| download | chromium_src-80a9966966b76bba436398ca529f9e4d509d5aab.zip chromium_src-80a9966966b76bba436398ca529f9e4d509d5aab.tar.gz chromium_src-80a9966966b76bba436398ca529f9e4d509d5aab.tar.bz2 | |
Move importer data types into a separate file to prepare for moving importer
into its own process.
BUG= 18774
TEST= none
Review URL: http://codereview.chromium.org/1110005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42224 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run_win.cc')
| -rw-r--r-- | chrome/browser/first_run_win.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/first_run_win.cc b/chrome/browser/first_run_win.cc index 2f3eda7..e3a3b52 100644 --- a/chrome/browser/first_run_win.cc +++ b/chrome/browser/first_run_win.cc @@ -36,6 +36,7 @@ #include "chrome/browser/extensions/extension_updater.h" #include "chrome/browser/hang_monitor/hung_window_detector.h" #include "chrome/browser/importer/importer.h" +#include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/pref_service.h" #include "chrome/browser/process_singleton.h" #include "chrome/browser/profile.h" @@ -312,10 +313,10 @@ bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir, if (installer_util::GetDistroBooleanPreference(prefs.get(), installer_util::master_preferences::kDistroImportSearchPref, &value)) { if (value) { - import_items += SEARCH_ENGINES; - out_prefs->do_import_items += SEARCH_ENGINES; + import_items += importer::SEARCH_ENGINES; + out_prefs->do_import_items += importer::SEARCH_ENGINES; } else { - out_prefs->dont_import_items += SEARCH_ENGINES; + out_prefs->dont_import_items += importer::SEARCH_ENGINES; } } @@ -344,15 +345,15 @@ bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir, if (installer_util::GetDistroBooleanPreference(prefs.get(), installer_util::master_preferences::kDistroImportHistoryPref, &value) && value) - import_items += HISTORY; + import_items += importer::HISTORY; if (installer_util::GetDistroBooleanPreference(prefs.get(), installer_util::master_preferences::kDistroImportBookmarksPref, &value) && value) - import_items += FAVORITES; + import_items += importer::FAVORITES; if (installer_util::GetDistroBooleanPreference(prefs.get(), installer_util::master_preferences::kDistroImportHomePagePref, &value) && value) - import_items += HOME_PAGE; + import_items += importer::HOME_PAGE; if (import_items) { // There is something to import from the default browser. This launches |