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

Side by Side Diff: chrome/browser/sync_file_system/sync_file_system_service.cc

Issue 407073003: [SyncFS] Add completion callback to PromoteDemotedChanges (1/3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/sync_file_system_service.h" 5 #include "chrome/browser/sync_file_system/sync_file_system_service.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/format_macros.h" 10 #include "base/format_macros.h"
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 return GetRemoteService(origin)->GetLocalChangeProcessor(); 354 return GetRemoteService(origin)->GetLocalChangeProcessor();
355 } 355 }
356 356
357 void SyncFileSystemService::OnSyncIdle() { 357 void SyncFileSystemService::OnSyncIdle() {
358 int64 remote_changes = 0; 358 int64 remote_changes = 0;
359 for (ScopedVector<SyncProcessRunner>::iterator iter = 359 for (ScopedVector<SyncProcessRunner>::iterator iter =
360 remote_sync_runners_.begin(); 360 remote_sync_runners_.begin();
361 iter != remote_sync_runners_.end(); ++iter) 361 iter != remote_sync_runners_.end(); ++iter)
362 remote_changes += (*iter)->pending_changes(); 362 remote_changes += (*iter)->pending_changes();
363 if (remote_changes == 0) 363 if (remote_changes == 0)
364 local_service_->PromoteDemotedChanges(); 364 local_service_->PromoteDemotedChanges(NoopClosure());
365 365
366 int64 local_changes = 0; 366 int64 local_changes = 0;
367 for (ScopedVector<SyncProcessRunner>::iterator iter = 367 for (ScopedVector<SyncProcessRunner>::iterator iter =
368 local_sync_runners_.begin(); 368 local_sync_runners_.begin();
369 iter != local_sync_runners_.end(); ++iter) 369 iter != local_sync_runners_.end(); ++iter)
370 local_changes += (*iter)->pending_changes(); 370 local_changes += (*iter)->pending_changes();
371 if (local_changes == 0 && v2_remote_service_) 371 if (local_changes == 0 && v2_remote_service_)
372 v2_remote_service_->PromoteDemotedChanges(); 372 v2_remote_service_->PromoteDemotedChanges(NoopClosure());
373 } 373 }
374 374
375 SyncServiceState SyncFileSystemService::GetSyncServiceState() { 375 SyncServiceState SyncFileSystemService::GetSyncServiceState() {
376 // For now we always query the state from the main RemoteFileSyncService. 376 // For now we always query the state from the main RemoteFileSyncService.
377 return RemoteStateToSyncServiceState(remote_service_->GetCurrentState()); 377 return RemoteStateToSyncServiceState(remote_service_->GetCurrentState());
378 } 378 }
379 379
380 SyncFileSystemService* SyncFileSystemService::GetSyncService() { 380 SyncFileSystemService* SyncFileSystemService::GetSyncService() {
381 return this; 381 return this;
382 } 382 }
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 v2_remote_service_->AddServiceObserver(v2_remote_syncer.get()); 753 v2_remote_service_->AddServiceObserver(v2_remote_syncer.get());
754 v2_remote_service_->AddFileStatusObserver(this); 754 v2_remote_service_->AddFileStatusObserver(this);
755 v2_remote_service_->SetRemoteChangeProcessor(local_service_.get()); 755 v2_remote_service_->SetRemoteChangeProcessor(local_service_.get());
756 v2_remote_service_->SetSyncEnabled(sync_enabled_); 756 v2_remote_service_->SetSyncEnabled(sync_enabled_);
757 remote_sync_runners_.push_back(v2_remote_syncer.release()); 757 remote_sync_runners_.push_back(v2_remote_syncer.release());
758 } 758 }
759 return v2_remote_service_.get(); 759 return v2_remote_service_.get();
760 } 760 }
761 761
762 } // namespace sync_file_system 762 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698