diff options
| author | rogerta <rogerta@chromium.org> | 2014-08-27 14:51:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-27 21:54:13 +0000 |
| commit | f15548e894657da4ec5eca5680e45d2253d34852 (patch) | |
| tree | 88d5573cf8680233b9b9824b6390ffa8750385ff /chrome/browser/sync_file_system/drive_backend/sync_engine.cc | |
| parent | 47106fe835d8d8aca61704d5d5a07bc8ea88fdf5 (diff) | |
| download | chromium_src-f15548e894657da4ec5eca5680e45d2253d34852.zip chromium_src-f15548e894657da4ec5eca5680e45d2253d34852.tar.gz chromium_src-f15548e894657da4ec5eca5680e45d2253d34852.tar.bz2 | |
Add IsAuthenticated() method to SigninManager to check for connected profile.
Make sure callers are using GetAuthenticatedUsername and GetAuthenticatedAccountId correctly.
BUG=341408
TBR=bauerb@chromium.org, benwells@chromium.org, gene@chromium.org, asvitkine@chromium.org, noms@chromium.org, tim@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/479353003
Cr-Commit-Position: refs/heads/master@{#292235}
Diffstat (limited to 'chrome/browser/sync_file_system/drive_backend/sync_engine.cc')
| -rw-r--r-- | chrome/browser/sync_file_system/drive_backend/sync_engine.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc index 3e1b39c..84a2ed54 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc @@ -274,8 +274,7 @@ void SyncEngine::Reset() { void SyncEngine::Initialize() { Reset(); - if (!signin_manager_ || - signin_manager_->GetAuthenticatedAccountId().empty()) + if (!signin_manager_ || !signin_manager_->IsAuthenticated()) return; DCHECK(drive_service_factory_); @@ -380,8 +379,7 @@ void SyncEngine::RegisterOrigin(const GURL& origin, if (!sync_worker_) { // TODO(tzik): Record |origin| and retry the registration after late // sign-in. Then, return SYNC_STATUS_OK. - if (!signin_manager_ || - signin_manager_->GetAuthenticatedAccountId().empty()) + if (!signin_manager_ || !signin_manager_->IsAuthenticated()) callback.Run(SYNC_STATUS_AUTHENTICATION_FAILED); else callback.Run(SYNC_STATUS_ABORT); |