diff options
| author | cmasone@chromium.org <cmasone@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 22:45:24 +0000 |
|---|---|---|
| committer | cmasone@chromium.org <cmasone@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 22:45:24 +0000 |
| commit | 7f82b2fbcad552ff78d0498911ec0bdce24f15b6 (patch) | |
| tree | bff3ba92b91f63912ec1378bf77e6738033ba959 /chrome/browser/browser_main.cc | |
| parent | ebc88a68755fa4a69edd173ba74331440afb968c (diff) | |
| download | chromium_src-7f82b2fbcad552ff78d0498911ec0bdce24f15b6.zip chromium_src-7f82b2fbcad552ff78d0498911ec0bdce24f15b6.tar.gz chromium_src-7f82b2fbcad552ff78d0498911ec0bdce24f15b6.tar.bz2 | |
Merge 64085 - [Chrome OS] Pass Google accounts password to sync
On Chrome OS, we initialize the master password used with password sync to
the user's Google accounts password. I believe this can be changed via the
UI.
BUG=chromium-os:7986,chromium-os:8416
TEST=unit tests, also installed on two devices and verified that a password I asked it to save synced.
Review URL: http://codereview.chromium.org/4200001
TBR=zelidrag@chromium.org
Review URL: http://codereview.chromium.org/4208006
git-svn-id: svn://svn.chromium.org/chrome/branches/552/src@64509 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 848864c..ea90522 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -782,9 +782,10 @@ class StubLogin : public chromeos::LoginStatusConsumer { } void OnLoginSuccess(const std::string& username, + const std::string& password, const GaiaAuthConsumer::ClientLoginResult& credentials, bool pending_requests) { - chromeos::LoginUtils::Get()->CompleteLogin(username, credentials); + chromeos::LoginUtils::Get()->CompleteLogin(username, password, credentials); delete this; } |