chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc - Issue 148483009: [SyncFS] Force activate folder tracker on folder creation conflict case

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc

Issue 148483009: [SyncFS] Force activate folder tracker on folder creation conflict case (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 10 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

« no previous file with comments | « chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc ('k') | chrome/browser/sync_file_system/drive_backend/metadata_database.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc

diff --git a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc

index 94a3380d942795b484d20ba6bb1d8dd771cfd860..14936b1279811499fec1f995dca8f9d7b62ea1b3 100644

--- a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc

+++ b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc

@@ -629,7 +629,7 @@ void LocalToRemoteSyncer::DidCreateRemoteFolder(

}

MetadataDatabase::ActivationStatus activation_status =

- metadata_database()->TryNoSideEffectActivation(

+ metadata_database()->TryActivateTracker(

remote_parent_folder_tracker_->tracker_id(),

file_id, callback);

switch (activation_status) {

@@ -646,9 +646,6 @@ void LocalToRemoteSyncer::DidCreateRemoteFolder(

weak_ptr_factory_.GetWeakPtr(),

callback));

return;

- case MetadataDatabase::ACTIVATION_FAILED_SAME_PATH_TRACKER:

- callback.Run(SYNC_STATUS_FILE_BUSY);

- return;

}

NOTREACHED();