Make password_manager.cc compile on Posix.

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

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

6 files changed, 7 insertions, 26 deletions

diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index 45106bd..73d6356 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -725,7 +725,6 @@ if not env.Bit('windows'):
       'net/dns_slave.cc',
       'google_update.cc',
       'password_manager/encryptor.cc',
-      'password_manager/password_manager.cc',
       'plugin_installer.cc',
       'plugin_process_host.cc',
       'plugin_service.cc',
diff --git a/chrome/browser/password_manager/password_form_manager.cc b/chrome/browser/password_manager/password_form_manager.cc
index 43120cc..138b713 100644
--- a/chrome/browser/password_manager/password_form_manager.cc
+++ b/chrome/browser/password_manager/password_form_manager.cc
@@ -6,14 +6,8 @@
 
 #include <algorithm>
 
-#if defined(OS_POSIX)
-// TODO(port): remove these when supporting classes are ported
-#include "chrome/common/temp_scaffolding_stubs.h"
-#elif defined(OS_WIN)
-#include "chrome/browser/password_manager/password_manager.h"
-#endif
-
 #include "base/string_util.h"
+#include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/profile.h"
 #include "webkit/glue/password_form_dom_manager.h"
 
diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc
index 4769f07..1b67d72 100644
--- a/chrome/browser/password_manager/password_manager.cc
+++ b/chrome/browser/password_manager/password_manager.cc
@@ -88,9 +88,9 @@ void PasswordManager::RegisterUserPrefs(PrefService* prefs) {
 }
 
 PasswordManager::PasswordManager(WebContents* web_contents)
-    : web_contents_(web_contents),
-      observer_(NULL),
-      login_managers_deleter_(&pending_login_managers_) {
+    : login_managers_deleter_(&pending_login_managers_),
+      web_contents_(web_contents),
+      observer_(NULL) {
   password_manager_enabled_.Init(prefs::kPasswordManagerEnabled,
       web_contents->profile()->GetPrefs(), NULL);
 }
diff --git a/chrome/browser/tab_contents/web_contents.cc b/chrome/browser/tab_contents/web_contents.cc
index 5920056..95ca5b7 100644
--- a/chrome/browser/tab_contents/web_contents.cc
+++ b/chrome/browser/tab_contents/web_contents.cc
@@ -19,6 +19,7 @@
 #include "chrome/browser/jsmessage_box_handler.h"
 #include "chrome/browser/load_from_memory_cache_details.h"
 #include "chrome/browser/load_notification_details.h"
+#include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
@@ -45,7 +46,6 @@
 #include "chrome/browser/download/download_request_manager.h"
 #include "chrome/browser/gears_integration.h"
 #include "chrome/browser/modal_html_dialog_delegate.h"
-#include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/plugin_installer.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/printing/print_job.h"
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj
index bd11ab2..2ee4f1a 100644
--- a/chrome/chrome.xcodeproj/project.pbxproj
+++ b/chrome/chrome.xcodeproj/project.pbxproj
@@ -572,6 +572,7 @@
 		E54EDFC97B4932925C31CB41 /* file_descriptor_set_posix.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4590B61B84978823B2BADA68 /* file_descriptor_set_posix.cc */; };
 		E765478D55A73228BAD044E3 /* cert_store.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8570E9D4839009A6919 /* cert_store.cc */; };
 		E9104FE91402AE1783A22D93 /* alternate_nav_url_fetcher.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8240E9D4839009A6919 /* alternate_nav_url_fetcher.cc */; };
+		EA8058FD371756B46906B157 /* password_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = B5D16EB40F21445600861FAC /* password_manager.cc */; };
 		F081CEE97F8C75FEAF3D0FD2 /* jstemplate_builder.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBC70E9D4C9F009A6919 /* jstemplate_builder.cc */; };
 		F47CA1280F44AE0E00FFFAFB /* libnet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D7B004E0E9D5464009A6919 /* libnet.a */; };
 		F47CA1290F44AE2800FFFAFB /* libglue.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 826850180F2FC82E009F6555 /* libglue.a */; };
@@ -5399,6 +5400,7 @@
 				4D7BF9AC0E9D4880009A6919 /* page_state.cc in Sources */,
 				4D7BFA280E9D490C009A6919 /* page_usage_data.cc in Sources */,
 				E48B6C2C0F27840B002E47EC /* password_form_manager.cc in Sources */,
+				EA8058FD371756B46906B157 /* password_manager.cc in Sources */,
 				826847800F2F69D1009F6555 /* profile.cc in Sources */,
 				8268477F0F2F69D1009F6555 /* profile_manager.cc in Sources */,
 				BAA609ED0F3BCAA800783510 /* protocol_manager.cc in Sources */,
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index d49aa50..8555acf 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -795,20 +795,6 @@ class PrintViewManager {
 };
 }
 
-class PasswordManager {
- public:
-  PasswordManager(WebContents*) { }
-  void ClearProvisionalSave() { NOTIMPLEMENTED(); }
-  void DidStopLoading() { NOTIMPLEMENTED(); }
-  void PasswordFormsSeen(const std::vector<PasswordForm>&) { NOTIMPLEMENTED(); }
-  void DidNavigate() { NOTIMPLEMENTED(); }
-  void ProvisionallySavePassword(PasswordForm form) { NOTIMPLEMENTED(); }
-  void Autofill(const PasswordForm&, const PasswordFormMap&,
-                const PasswordForm* const) const {
-    NOTIMPLEMENTED();
-  }
-};
-
 class PluginInstaller {
  public:
   PluginInstaller(WebContents*) { }