Remove final traces of IE from cross-platform password manager.

(It's still there for Windows, but not on other platforms.)

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


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

3 files changed, 12 insertions, 1 deletions

diff --git a/chrome/browser/password_manager/password_form_manager.cc b/chrome/browser/password_manager/password_form_manager.cc
index 895b1e6..43120cc 100644
--- a/chrome/browser/password_manager/password_form_manager.cc
+++ b/chrome/browser/password_manager/password_form_manager.cc
@@ -246,8 +246,10 @@ void PasswordFormManager::OnRequestDone(WebDataService::Handle h,
   state_ = POST_MATCHING_PHASE;
 
   if (best_score <= 0) {
+#if defined(OS_WIN)
     state_ = PRE_MATCHING_PHASE;
     FetchMatchingIE7LoginFromWebDatabase();
+#endif
     return;
   }
 
@@ -291,10 +293,12 @@ void PasswordFormManager::OnWebDataServiceRequestDone(WebDataService::Handle h,
       OnRequestDone(h, result);
       break;
     }
+#if defined(OS_WIN)
     case PASSWORD_IE7_RESULT: {
       OnIE7RequestDone(h, result);
       break;
     }
+#endif
     default:
       NOTREACHED();
   }
diff --git a/chrome/browser/password_manager/password_form_manager.h b/chrome/browser/password_manager/password_form_manager.h
index 9d0d8a6..3e61476 100644
--- a/chrome/browser/password_manager/password_form_manager.h
+++ b/chrome/browser/password_manager/password_form_manager.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_PASSWORD_FORM_MANAGER_H__
 #define CHROME_BROWSER_PASSWORD_FORM_MANAGER_H__
 
+#include "build/build_config.h"
 #include "chrome/common/stl_util-inl.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "webkit/glue/password_form.h"
@@ -32,7 +33,9 @@ class PasswordFormManager : public WebDataServiceConsumer {
 
   // Retrieves potential matching logins from the database.
   void FetchMatchingLoginsFromWebDatabase();
+#if defined(OS_WIN)
   void FetchMatchingIE7LoginFromWebDatabase();
+#endif
 
   // Simple state-check to verify whether this object as received a callback
   // from the web database and completed its matching phase. Note that the
@@ -64,9 +67,11 @@ class PasswordFormManager : public WebDataServiceConsumer {
   // Determines if we need to autofill given the results of the query.
   void OnRequestDone(WebDataService::Handle h, const WDTypedResult* result);
 
+#if defined(OS_WIN)
   // Determines if we need to autofill given the results of the query in the
   // ie7_password table.
   void OnIE7RequestDone(WebDataService::Handle h, const WDTypedResult* result);
+#endif
 
   // A user opted to 'never remember' passwords for this form.
   // Blacklist it so that from now on when it is seen we ignore it.
diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h
index e7a8e6d..e6fc18d 100644
--- a/chrome/browser/webdata/web_data_service.h
+++ b/chrome/browser/webdata/web_data_service.h
@@ -49,7 +49,9 @@ typedef enum {
   KEYWORDS_RESULT,       // WDResult<WDKeywordsResult>
   INT64_RESULT,          // WDResult<int64>
   PASSWORD_RESULT,       // WDResult<std::vector<PasswordForm*>>
+#if defined(OS_WIN)
   PASSWORD_IE7_RESULT,   // WDResult<IE7PasswordInfo>
+#endif
   WEB_APP_IMAGES,        // WDResult<WDAppImagesResult>
   AUTOFILL_VALUE_RESULT, // WDResult<std::vector<std::wstring>>
 } WDResultType;
@@ -345,7 +347,7 @@ class WebDataService : public base::RefCountedThreadSafe<WebDataService> {
 
   // Removes |info| from the list of imported passwords from ie7/ie8.
   void RemoveIE7Login(const IE7PasswordInfo& info);
- 
+
   // Get the login matching the information in |info|. |consumer| will be
   // notified when the request is done. The result is of type
   // WDResult<IE7PasswordInfo>.