chrome/browser/sync_file_system/local_file_sync_service.cc - Issue 12315004: Migrated sync_file_type and file_change from namespace fileapi to sync_file_system.

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/local_file_sync_service.cc

Issue 12315004: Migrated sync_file_type and file_change from namespace fileapi to sync_file_system. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 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/local_file_sync_service.h ('k') | chrome/browser/sync_file_system/local_file_sync_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/local_file_sync_service.cc

diff --git a/chrome/browser/sync_file_system/local_file_sync_service.cc b/chrome/browser/sync_file_system/local_file_sync_service.cc

index b352152af6823b1cdcc12f3607956bc87ebe9ec8..c8c4e26ff69e2c4a3a07c14fbaacf6e0b5559923 100644

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

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

@@ -22,8 +22,6 @@

#include "webkit/fileapi/syncable/sync_file_metadata.h"

using content::BrowserThread;

-using fileapi::FileChange;

-using fileapi::FileChangeList;

using fileapi::FileSystemURL;

using fileapi::LocalFileSyncContext;

using fileapi::LocalFileSyncInfo;

@@ -32,6 +30,8 @@ using fileapi::SyncFileMetadataCallback;

using fileapi::SyncStatusCallback;

using fileapi::SyncStatusCode;

+using sync_file_system::FileChange;

+using sync_file_system::FileChangeList;

namespace sync_file_system {

@@ -250,7 +250,7 @@ void LocalFileSyncService::ClearLocalChanges(

void LocalFileSyncService::RecordFakeLocalChange(

const fileapi::FileSystemURL& url,

- const fileapi::FileChange& change,

+ const FileChange& change,

const fileapi::SyncStatusCallback& callback) {

DCHECK(ContainsKey(origin_to_contexts_, url.origin()));

sync_context_->RecordFakeLocalChange(origin_to_contexts_[url.origin()],