chrome/browser/sync_file_system/drive_file_sync_service.cc - Issue 11421222: Fix DriveFileSyncService::GetOriginForEntry

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_file_sync_service.cc

Issue 11421222: Fix DriveFileSyncService::GetOriginForEntry (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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 e0edc101ece985f4c1455178f2fed993ed1668c3..381bfebec58aa5aff8fefeefe3642c4c124a9557 100644

--- a/chrome/browser/sync_file_system/drive_file_sync_service.cc

+++ b/chrome/browser/sync_file_system/drive_file_sync_service.cc

@@ -1461,9 +1461,9 @@ bool DriveFileSyncService::GetOriginForEntry(

itr != entry.links().end(); ++itr) {

if ((*itr)->type() != google_apis::Link::LINK_PARENT)

continue;

- GURL origin(UTF16ToUTF8((*itr)->title()));

- if (!origin.is_valid())

- continue;

+ GURL origin(DriveFileSyncClient::DirectoryTitleToOrigin(

+ UTF16ToUTF8((*itr)->title())));

+ DCHECK(origin.is_valid());

if (!metadata_store_->IsBatchSyncOrigin(origin) &&

!metadata_store_->IsIncrementalSyncOrigin(origin))

« no previous file with comments | « no previous file | no next file » | no next file with comments »