Make importer.cc compile on Posix.

Review URL: http://codereview.chromium.org/27242

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10528 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 36 insertions, 8 deletions

diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index 76c9d85..0cb68e8 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -692,7 +692,6 @@ if not env.Bit('windows'):
       'importer/firefox3_importer.cc',
       'importer/firefox_importer_utils.cc',
       'importer/ie_importer.cc',
-      'importer/importer.cc',
       'importer/toolbar_importer.cc',
       'jankometer.cc',
       'login_prompt.cc',
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index 88923ca..6a2e59f 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -20,23 +20,29 @@
 #include "chrome/browser/importer/firefox3_importer.h"
 #include "chrome/browser/importer/firefox_importer_utils.h"
 #include "chrome/browser/importer/firefox_profile_lock.h"
+#if defined(OS_WIN)
 #include "chrome/browser/importer/ie_importer.h"
+#endif
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/tab_contents/site_instance.h"
-#include "chrome/browser/views/importer_lock_view.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/gfx/favicon_size.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/common/win_util.h"
-#include "chrome/views/window.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/image_operations.h"
 #include "webkit/glue/image_decoder.h"
 
+// TODO(port): Port these files.
+#if defined(OS_WIN)
+#include "chrome/browser/views/importer_lock_view.h"
+#include "chrome/common/win_util.h"
+#include "chrome/views/window.h"
+#endif
+
 // ProfileWriter.
 
 bool ProfileWriter::BookmarkModelIsLoaded() const {
@@ -64,9 +70,11 @@ void ProfileWriter::AddPasswordForm(const PasswordForm& form) {
   profile_->GetWebDataService(Profile::EXPLICIT_ACCESS)->AddLogin(form);
 }
 
+#if defined(OS_WIN)
 void ProfileWriter::AddIE7PasswordInfo(const IE7PasswordInfo& info) {
   profile_->GetWebDataService(Profile::EXPLICIT_ACCESS)->AddIE7Login(info);
 }
+#endif
 
 void ProfileWriter::AddHistoryPage(const std::vector<history::URLRow>& page) {
   profile_->GetHistoryService(Profile::EXPLICIT_ACCESS)->
@@ -270,7 +278,7 @@ void ProfileWriter::AddKeywords(const std::vector<TemplateURL*>& template_urls,
     }
     if (t_url->url() && t_url->url()->IsValid()) {
       model->Add(t_url);
-      if (default_keyword && t_url->url() && 
+      if (default_keyword && t_url->url() &&
           t_url->url()->SupportsReplacement())
         model->SetDefaultSearchProvider(t_url);
     } else {
@@ -330,7 +338,7 @@ bool ProfileWriter::DoesBookmarkExist(
   model->GetNodesByURL(entry.url, &nodes_with_same_url);
   if (nodes_with_same_url.empty())
     return false;
-  
+
   for (size_t i = 0; i < nodes_with_same_url.size(); ++i) {
     BookmarkNode* node = nodes_with_same_url[i];
     if (entry.title != node->GetTitle())
@@ -448,8 +456,13 @@ void ImporterHost::ShowWarningDialog() {
   if (headless_) {
     OnLockViewEnd(false);
   } else {
+#if defined(OS_WIN)
     views::Window::CreateChromeWindow(GetActiveWindow(), gfx::Rect(),
                                       new ImporterLockView(this))->Show();
+#else
+    // TODO(port): Need CreateChromeWindow.
+    NOTIMPLEMENTED();
+#endif
   }
 }
 
@@ -562,8 +575,10 @@ void ImporterHost::ImportEnded() {
 
 Importer* ImporterHost::CreateImporterByType(ProfileType type) {
   switch (type) {
+#if defined(OS_WIN)
     case MS_IE:
       return new IEImporter();
+#endif
     case BOOKMARKS_HTML:
     case FIREFOX2:
       return new Firefox2Importer();
@@ -589,6 +604,7 @@ const ProfileInfo& ImporterHost::GetSourceProfileInfoAt(int index) const {
 }
 
 void ImporterHost::DetectSourceProfiles() {
+#if defined(OS_WIN)
   // The order in which detect is called determines the order
   // in which the options appear in the dropdown combo-box
   if (ShellIntegration::IsFirefoxDefaultBrowser()) {
@@ -598,8 +614,13 @@ void ImporterHost::DetectSourceProfiles() {
     DetectIEProfiles();
     DetectFirefoxProfiles();
   }
+#else
+  DetectFirefoxProfiles();
+#endif
 }
 
+
+#if defined(OS_WIN)
 void ImporterHost::DetectIEProfiles() {
   // IE always exists and don't have multiple profiles.
   ProfileInfo* ie = new ProfileInfo();
@@ -611,6 +632,7 @@ void ImporterHost::DetectIEProfiles() {
       SEARCH_ENGINES;
   source_profiles_.push_back(ie);
 }
+#endif
 
 void ImporterHost::DetectFirefoxProfiles() {
   // Detects which version of Firefox is installed.
diff --git a/chrome/browser/importer/importer.h b/chrome/browser/importer/importer.h
index ee5ac37..bdda367 100644
--- a/chrome/browser/importer/importer.h
+++ b/chrome/browser/importer/importer.h
@@ -27,7 +27,9 @@
 // An enumeration of the type of browsers that we support to import
 // settings and data from them.
 enum ProfileType {
-  MS_IE = 0,
+#if defined(OS_WIN)
+  MS_IE,
+#endif
   FIREFOX2,
   FIREFOX3,
   // Identifies a 'bookmarks.html' file.
@@ -276,7 +278,9 @@ class ImporterHost : public base::RefCounted<ImporterHost>,
   void DetectSourceProfiles();
 
   // Helper methods for detecting available profiles.
+#if defined(OS_WIN)
   void DetectIEProfiles();
+#endif
   void DetectFirefoxProfiles();
 
   // The list of profiles with the default one first.
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index e813fd6..3757caa 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1170,7 +1170,6 @@
             'browser/importer/firefox3_importer.cc',
             'browser/importer/firefox_importer_utils.cc',
             'browser/importer/ie_importer.cc',
-            'browser/importer/importer.cc',
             'browser/tab_contents/native_ui_contents.cc',
             'browser/tab_contents/render_view_context_menu_controller.cc',
             'browser/tab_contents/web_drag_source.cc',
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj
index fdf2efe..07d3200 100644
--- a/chrome/chrome.xcodeproj/project.pbxproj
+++ b/chrome/chrome.xcodeproj/project.pbxproj
@@ -358,6 +358,7 @@
 		96DF109FEE9B09B11690F1FA /* infobar_delegate.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6CCB9CF0F1EC32700106F0D /* infobar_delegate.cc */; };
 		970EF19CD8A79CF3D0DF4B61 /* download_file.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF9CA0E9D48CE009A6919 /* download_file.cc */; };
 		97DD178B77011735FE4399E9 /* file_descriptor_set_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = D74DA6A9031CAE292790BD5E /* file_descriptor_set_unittest.cc */; };
+		9B309D9E7FD33D1D31444ED9 /* importer.cc in Sources */ = {isa = PBXBuildFile; fileRef = D224399513442348FF231FCB /* importer.cc */; };
 		9E85B39CA40439D93CE52E60 /* fav_icon_helper.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8760E9D4839009A6919 /* fav_icon_helper.cc */; };
 		A0BC9272AD709E86D492DAEC /* bookmark_storage.cc in Sources */ = {isa = PBXBuildFile; fileRef = D941DBEFD8B8B537DE8A4DAE /* bookmark_storage.cc */; };
 		A0EB956531B9DB1E40DAE980 /* user_script_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 37521A11B07C479E93A39D52 /* user_script_unittest.cc */; };
@@ -2752,6 +2753,7 @@
 		C3F9577C67188A5A4E3A6E41 /* session_restore.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = session_restore.cc; path = sessions/session_restore.cc; sourceTree = "<group>"; };
 		C8D26D9EC81E03E91E270463 /* session_service.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = session_service.cc; path = sessions/session_service.cc; sourceTree = "<group>"; };
 		CAA0BC4B0F54A8F7004DEE42 /* hunspell.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = hunspell.xcodeproj; path = chrome/third_party/hunspell/hunspell.xcodeproj; sourceTree = "<group>"; };
+		D224399513442348FF231FCB /* importer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = importer.cc; path = browser/importer/importer.cc; sourceTree = SOURCE_ROOT; };
 		D3C3DAA911D390A33D06B0B0 /* history_url_provider.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = history_url_provider.cc; path = browser/autocomplete/history_url_provider.cc; sourceTree = SOURCE_ROOT; };
 		D74DA6A9031CAE292790BD5E /* file_descriptor_set_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_descriptor_set_unittest.cc; sourceTree = "<group>"; };
 		D792830F807C366EAB752D69 /* dev_tools_agent.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dev_tools_agent.cc; sourceTree = "<group>"; };
@@ -3350,6 +3352,7 @@
 				E7FDE61828F151056D975855 /* bookmark_drag_data.cc */,
 				12F137DA942221A44BFA0967 /* bookmark_drop_info.cc */,
 				90BF0D1189BB7158BD7F1600 /* bookmark_context_menu.cc */,
+				D224399513442348FF231FCB /* importer.cc */,
 			);
 			sourceTree = "<group>";
 		};
@@ -5780,6 +5783,7 @@
 				4D7BFA1F0E9D4901009A6919 /* history_types.cc in Sources */,
 				E477FF4F0F5338600044ABEB /* history_ui.cc in Sources */,
 				12E687ED55D418FEE894F824 /* history_url_provider.cc in Sources */,
+				9B309D9E7FD33D1D31444ED9 /* importer.cc in Sources */,
 				4D7BFA240E9D4905009A6919 /* in_memory_database.cc in Sources */,
 				4D7BFA260E9D4908009A6919 /* in_memory_history_backend.cc in Sources */,
 				96DF109FEE9B09B11690F1FA /* infobar_delegate.cc in Sources */,