Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(743)

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/sync_engine.cc

Issue 479353003: Add IsAuthenticated() method to SigninManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h" 5 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 drive_service_.reset(); 267 drive_service_.reset();
268 drive_uploader_wrapper_.reset(); 268 drive_uploader_wrapper_.reset();
269 drive_uploader_.reset(); 269 drive_uploader_.reset();
270 remote_change_processor_wrapper_.reset(); 270 remote_change_processor_wrapper_.reset();
271 callback_tracker_.AbortAll(); 271 callback_tracker_.AbortAll();
272 } 272 }
273 273
274 void SyncEngine::Initialize() { 274 void SyncEngine::Initialize() {
275 Reset(); 275 Reset();
276 276
277 if (!signin_manager_ || 277 if (!signin_manager_ || !signin_manager_->IsAuthenticated())
278 signin_manager_->GetAuthenticatedAccountId().empty())
279 return; 278 return;
280 279
281 DCHECK(drive_service_factory_); 280 DCHECK(drive_service_factory_);
282 scoped_ptr<drive::DriveServiceInterface> drive_service = 281 scoped_ptr<drive::DriveServiceInterface> drive_service =
283 drive_service_factory_->CreateDriveService( 282 drive_service_factory_->CreateDriveService(
284 token_service_, request_context_.get(), drive_task_runner_.get()); 283 token_service_, request_context_.get(), drive_task_runner_.get());
285 scoped_ptr<drive::DriveUploaderInterface> drive_uploader( 284 scoped_ptr<drive::DriveUploaderInterface> drive_uploader(
286 new drive::DriveUploader(drive_service.get(), drive_task_runner_.get())); 285 new drive::DriveUploader(drive_service.get(), drive_task_runner_.get()));
287 286
288 InitializeInternal(drive_service.Pass(), drive_uploader.Pass(), 287 InitializeInternal(drive_service.Pass(), drive_uploader.Pass(),
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 372
374 void SyncEngine::AddFileStatusObserver(FileStatusObserver* observer) { 373 void SyncEngine::AddFileStatusObserver(FileStatusObserver* observer) {
375 file_status_observers_.AddObserver(observer); 374 file_status_observers_.AddObserver(observer);
376 } 375 }
377 376
378 void SyncEngine::RegisterOrigin(const GURL& origin, 377 void SyncEngine::RegisterOrigin(const GURL& origin,
379 const SyncStatusCallback& callback) { 378 const SyncStatusCallback& callback) {
380 if (!sync_worker_) { 379 if (!sync_worker_) {
381 // TODO(tzik): Record |origin| and retry the registration after late 380 // TODO(tzik): Record |origin| and retry the registration after late
382 // sign-in. Then, return SYNC_STATUS_OK. 381 // sign-in. Then, return SYNC_STATUS_OK.
383 if (!signin_manager_ || 382 if (!signin_manager_ || !signin_manager_->IsAuthenticated())
384 signin_manager_->GetAuthenticatedAccountId().empty())
385 callback.Run(SYNC_STATUS_AUTHENTICATION_FAILED); 383 callback.Run(SYNC_STATUS_AUTHENTICATION_FAILED);
386 else 384 else
387 callback.Run(SYNC_STATUS_ABORT); 385 callback.Run(SYNC_STATUS_ABORT);
388 return; 386 return;
389 } 387 }
390 388
391 SyncStatusCallback relayed_callback = RelayCallbackToCurrentThread( 389 SyncStatusCallback relayed_callback = RelayCallbackToCurrentThread(
392 FROM_HERE, base::Bind(&DidRegisterOrigin, base::TimeTicks::Now(), 390 FROM_HERE, base::Bind(&DidRegisterOrigin, base::TimeTicks::Now(),
393 TrackCallback(callback))); 391 TrackCallback(callback)));
394 392
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
782 780
783 SyncStatusCallback SyncEngine::TrackCallback( 781 SyncStatusCallback SyncEngine::TrackCallback(
784 const SyncStatusCallback& callback) { 782 const SyncStatusCallback& callback) {
785 return callback_tracker_.Register( 783 return callback_tracker_.Register(
786 base::Bind(callback, SYNC_STATUS_ABORT), 784 base::Bind(callback, SYNC_STATUS_ABORT),
787 callback); 785 callback);
788 } 786 }
789 787
790 } // namespace drive_backend 788 } // namespace drive_backend
791 } // namespace sync_file_system 789 } // namespace sync_file_system
OLDNEW
« no previous file with comments | « chrome/browser/sync/sync_ui_util.cc ('k') | chrome/browser/ui/app_list/search/people/people_result.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698