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/views/first_run_view_base.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/views/first_run_view_base.cc')
| -rw-r--r-- | chrome/browser/views/first_run_view_base.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/chrome/browser/views/first_run_view_base.cc b/chrome/browser/views/first_run_view_base.cc index 88e2b9d..300d9c9 100644 --- a/chrome/browser/views/first_run_view_base.cc +++ b/chrome/browser/views/first_run_view_base.cc @@ -12,6 +12,7 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/first_run.h" +#include "chrome/browser/importer/importer.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/pref_service.h" #include "chrome/browser/shell_integration.h" @@ -187,16 +188,16 @@ int FirstRunViewBase::GetImportItems() const { // the process take way too much time among other issues. So for the time // being we say: TODO(CPU): Bug 1196875 int items = import_items_; - if (!(dont_import_items_ & HISTORY)) - items = items | HISTORY; - if (!(dont_import_items_ & FAVORITES)) - items = items | FAVORITES; - if (!(dont_import_items_ & PASSWORDS)) - items = items | PASSWORDS; - if (!(dont_import_items_ & SEARCH_ENGINES)) - items = items | SEARCH_ENGINES; + if (!(dont_import_items_ & importer::HISTORY)) + items = items | importer::HISTORY; + if (!(dont_import_items_ & importer::FAVORITES)) + items = items | importer::FAVORITES; + if (!(dont_import_items_ & importer::PASSWORDS)) + items = items | importer::PASSWORDS; + if (!(dont_import_items_ & importer::SEARCH_ENGINES)) + items = items | importer::SEARCH_ENGINES; if (!homepage_defined_) - items = items | HOME_PAGE; + items = items | importer::HOME_PAGE; return items; }; |