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

Unified Diff: chrome/browser/sync_file_system/drive_file_sync_service.cc

Issue 16232019: Fix for finding a disabled origin after it was already moved to enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Hiroki review #2 Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync_file_system/drive_file_sync_service.cc
diff --git a/chrome/browser/sync_file_system/drive_file_sync_service.cc b/chrome/browser/sync_file_system/drive_file_sync_service.cc
index b26eaa136f6143cf8f6237233c73e847c046ed19..c173892fcc30fb3b0181b466c240c224b89708f4 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_service.cc
+++ b/chrome/browser/sync_file_system/drive_file_sync_service.cc
@@ -500,14 +500,16 @@ void DriveFileSyncService::DoUnregisterOriginForTrackingChanges(
void DriveFileSyncService::DoEnableOriginForTrackingChanges(
const GURL& origin,
const SyncStatusCallback& callback) {
+ // If origin cannot be found in disabled list, then it's not a SyncFS app
+ // and should be ignored.
if (!metadata_store_->IsOriginDisabled(origin)) {
callback.Run(SYNC_STATUS_OK);
return;
}
- metadata_store_->EnableOrigin(origin, callback);
pending_batch_sync_origins_.insert(
*metadata_store_->disabled_origins().find(origin));
+ metadata_store_->EnableOrigin(origin, callback);
}
void DriveFileSyncService::DoDisableOriginForTrackingChanges(

Powered by Google App Engine
This is Rietveld 408576698