chrome/browser/sync_file_system/mock_remote_file_sync_service.h - Issue 12304015: Migrated sync_file_status, sync_action and sync_direction from fileapi:: namespace to sync_file_sys…

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/mock_remote_file_sync_service.h

Issue 12304015: Migrated sync_file_status, sync_action and sync_direction from fileapi:: namespace to sync_file_sys… (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/file_status_observer.h ('k') | chrome/browser/sync_file_system/mock_remote_file_sync_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/mock_remote_file_sync_service.h

diff --git a/chrome/browser/sync_file_system/mock_remote_file_sync_service.h b/chrome/browser/sync_file_system/mock_remote_file_sync_service.h

index e48a45469ea4246b7e344b0c28fe5ef010ede169..b7cb9cc18c14f5c3c9db68c4571ca02b8f3b319d 100644

--- a/chrome/browser/sync_file_system/mock_remote_file_sync_service.h

+++ b/chrome/browser/sync_file_system/mock_remote_file_sync_service.h

@@ -61,9 +61,9 @@ class MockRemoteFileSyncService : public RemoteFileSyncService {

const std::string& description);

void NotifyFileStatusChanged(

const fileapi::FileSystemURL& url,

- fileapi::SyncFileStatus sync_status,

- fileapi::SyncAction action_taken,

- fileapi::SyncDirection direction);

+ SyncFileStatus sync_status,

+ SyncAction action_taken,

+ SyncDirection direction);

// Sets conflict file information. The information is returned by

// the default action for GetRemoteConflictFileInfo.