diff options
| author | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 23:53:59 +0000 |
|---|---|---|
| committer | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 23:53:59 +0000 |
| commit | 66fc07720d598d1179d34115d0beb845ee05275b (patch) | |
| tree | 15cd7019b1b7eedc0b2d72d190c7a961a1a1350f | |
| parent | a470dd75655af14825a4ab5d9236cc72d0eac6fc (diff) | |
| download | chromium_src-66fc07720d598d1179d34115d0beb845ee05275b.zip chromium_src-66fc07720d598d1179d34115d0beb845ee05275b.tar.gz chromium_src-66fc07720d598d1179d34115d0beb845ee05275b.tar.bz2 | |
Fix chromeOs build after 71381.
TBR=tim
BUG=62103
TEST=none
Review URL: http://codereview.chromium.org/6266004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71387 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/login/login_utils.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/chromeos/login/screen_locker.cc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index 7eb48ba..e6442e9 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -268,7 +268,9 @@ void LoginUtilsImpl::CompleteLogin( // Set the CrOS user by getting this constructor run with the // user's email on first retrieval. - profile->GetProfileSyncService(username)->SetPassphrase(password, false); + profile->GetProfileSyncService(username)->SetPassphrase(password, + false, + true); btl->AddLoginTimeMarker("SyncStarted", false); // Attempt to take ownership; this will fail if device is already owned. diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc index 5bc78cb..26615ad 100644 --- a/chrome/browser/chromeos/login/screen_locker.cc +++ b/chrome/browser/chromeos/login/screen_locker.cc @@ -792,7 +792,7 @@ void ScreenLocker::OnLoginSuccess( ProfileSyncService* service = profile->GetProfileSyncService(username); if (service && !service->HasSyncSetupCompleted()) { // If sync has failed somehow, try setting the sync passphrase here. - service->SetPassphrase(password, false); + service->SetPassphrase(password, false, true); } } |