diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-01 20:23:22 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-01 20:23:22 +0000 |
| commit | 932289db27336277e6bab6fd48542db9cd513458 (patch) | |
| tree | 13dda07348f3b520e128d2f0d1dd8794bf8c6ef7 /chrome/browser/importer/importer.h | |
| parent | 04d34f27c22ef87e38df03d5effb26c38cfb8c92 (diff) | |
| download | chromium_src-932289db27336277e6bab6fd48542db9cd513458.zip chromium_src-932289db27336277e6bab6fd48542db9cd513458.tar.gz chromium_src-932289db27336277e6bab6fd48542db9cd513458.tar.bz2 | |
Revert change 6149 because it broke the unit tests on windows.
Review URL: http://codereview.chromium.org/12834
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer/importer.h')
| -rw-r--r-- | chrome/browser/importer/importer.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/chrome/browser/importer/importer.h b/chrome/browser/importer/importer.h index f7190e9..4e57b64 100644 --- a/chrome/browser/importer/importer.h +++ b/chrome/browser/importer/importer.h @@ -8,18 +8,15 @@ #include <set> #include <vector> -#include "build/build_config.h" - #include "base/basictypes.h" #include "base/message_loop.h" #include "base/ref_counted.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/history/history_types.h" -#if defined(OS_WIN) #include "chrome/browser/ie7_password.h" -#endif #include "chrome/browser/profile.h" #include "chrome/browser/template_url.h" +#include "chrome/browser/views/importer_lock_view.h" #include "chrome/common/notification_service.h" #include "googleurl/src/gurl.h" #include "webkit/glue/password_form.h" @@ -100,9 +97,7 @@ class ProfileWriter : public base::RefCounted<ProfileWriter> { // Helper methods for adding data to local stores. virtual void AddPasswordForm(const PasswordForm& form); -#if defined(OS_WIN) virtual void AddIE7PasswordInfo(const IE7PasswordInfo& info); -#endif virtual void AddHistoryPage(const std::vector<history::URLRow>& page); virtual void AddHomepage(const GURL& homepage); // Adds the bookmarks to the BookmarkModel. @@ -412,9 +407,6 @@ class ImportObserver { }; -#if defined(OS_WIN) -// TODO(port): Make StartImportingWithUI portable. - // Shows a UI for importing and begins importing the specified items from // source_profile to target_profile. observer is notified when the process is // complete, can be NULL. parent is the window to parent the UI to, can be NULL @@ -427,6 +419,5 @@ void StartImportingWithUI(HWND parent_window, Profile* target_profile, ImportObserver* observer, bool first_run); -#endif #endif // CHROME_BROWSER_IMPORTER_IMPORTER_H_ |