diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-09 22:52:05 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-09 22:52:05 +0000 |
| commit | a53bb6f7db58fa59fb2dd3b6508b6acc0d1d44ad (patch) | |
| tree | d86a34f9388bc314fb635753db1a50117194ed95 /chrome/browser | |
| parent | 440d8dba5acdec78133af93ca788a9e995fedb49 (diff) | |
| download | chromium_src-a53bb6f7db58fa59fb2dd3b6508b6acc0d1d44ad.zip chromium_src-a53bb6f7db58fa59fb2dd3b6508b6acc0d1d44ad.tar.gz chromium_src-a53bb6f7db58fa59fb2dd3b6508b6acc0d1d44ad.tar.bz2 | |
Fix password import for OS X Firefox.
BUG=18775
TEST=import passwords from Firefox on OS X.
Review URL: http://codereview.chromium.org/2725005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49336 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/importer/profile_writer.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/importer/safari_importer.mm | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc index ee12572..6217408 100644 --- a/chrome/browser/importer/profile_writer.cc +++ b/chrome/browser/importer/profile_writer.cc @@ -8,6 +8,7 @@ #include "base/thread.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/importer/importer.h" +#include "chrome/browser/password_manager/password_store.h" #include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url_model.h" @@ -25,7 +26,7 @@ bool ProfileWriter::TemplateURLModelIsLoaded() const { } void ProfileWriter::AddPasswordForm(const PasswordForm& form) { - profile_->GetWebDataService(Profile::EXPLICIT_ACCESS)->AddLogin(form); + profile_->GetPasswordStore(Profile::EXPLICIT_ACCESS)->AddLogin(form); } #if defined(OS_WIN) diff --git a/chrome/browser/importer/safari_importer.mm b/chrome/browser/importer/safari_importer.mm index b124b84..2cd776c 100644 --- a/chrome/browser/importer/safari_importer.mm +++ b/chrome/browser/importer/safari_importer.mm @@ -306,7 +306,7 @@ void SafariImporter::ImportPasswords() { // Safari stores it's passwords in the Keychain, same as us so we don't need // to import them. // Note: that we don't automatically pick them up, there is some logic around - // the user needing to explicitly input his username in a page and bluring + // the user needing to explicitly input his username in a page and blurring // the field before we pick it up, but the details of that are beyond the // scope of this comment. } |