chrome/browser/sync_file_system/remote_sync_operation_resolver.h - Issue 15806012: Move webkit/fileapi/syncable/* code to webkit/browser/fileapi (final!)

Side by Side Diff

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

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

Side by Side Diff: chrome/browser/sync_file_system/remote_sync_operation_resolver.h

Issue 15806012: Move webkit/fileapi/syncable/* code to webkit/browser/fileapi (final!) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/sync_file_system/remote_file_sync_service.h ('k') | chrome/browser/sync_file_system/remote_sync_operation_resolver_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_REMOTE_SYNC_OPERATION_RESOLVER_H_	5 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_REMOTE_SYNC_OPERATION_RESOLVER_H_

6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_REMOTE_SYNC_OPERATION_RESOLVER_H_	6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_REMOTE_SYNC_OPERATION_RESOLVER_H_

7	7

8 #include "base/gtest_prod_util.h"	8 #include "base/gtest_prod_util.h"

9 #include "webkit/fileapi/syncable/file_change.h"	9 #include "webkit/browser/fileapi/syncable/file_change.h"

10 #include "webkit/fileapi/syncable/sync_file_type.h"	10 #include "webkit/browser/fileapi/syncable/sync_file_type.h"

11	11

12 namespace sync_file_system {	12 namespace sync_file_system {

13	13

14 enum RemoteSyncOperationType {	14 enum RemoteSyncOperationType {

15 REMOTE_SYNC_OPERATION_ADD_FILE,	15 REMOTE_SYNC_OPERATION_ADD_FILE,

16 REMOTE_SYNC_OPERATION_ADD_DIRECTORY,	16 REMOTE_SYNC_OPERATION_ADD_DIRECTORY,

17 REMOTE_SYNC_OPERATION_UPDATE_FILE,	17 REMOTE_SYNC_OPERATION_UPDATE_FILE,

18 REMOTE_SYNC_OPERATION_DELETE_FILE,	18 REMOTE_SYNC_OPERATION_DELETE_FILE,

19 REMOTE_SYNC_OPERATION_DELETE_DIRECTORY,	19 REMOTE_SYNC_OPERATION_DELETE_DIRECTORY,

20 REMOTE_SYNC_OPERATION_NONE,	20 REMOTE_SYNC_OPERATION_NONE,

(...skipping 52 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
73 ResolveForDeleteFileInConflict);	73 ResolveForDeleteFileInConflict);

74 FRIEND_TEST_ALL_PREFIXES(RemoteSyncOperationResolverTest,	74 FRIEND_TEST_ALL_PREFIXES(RemoteSyncOperationResolverTest,

75 ResolveForDeleteDirectory);	75 ResolveForDeleteDirectory);

76 FRIEND_TEST_ALL_PREFIXES(RemoteSyncOperationResolverTest,	76 FRIEND_TEST_ALL_PREFIXES(RemoteSyncOperationResolverTest,

77 ResolveForDeleteDirectoryInConflict);	77 ResolveForDeleteDirectoryInConflict);

78 };	78 };

79	79

80 } // namespace sync_file_system	80 } // namespace sync_file_system

81	81

82 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_REMOTE_SYNC_OPERATION_RESOLVER_H_	82 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_REMOTE_SYNC_OPERATION_RESOLVER_H_

OLD	NEW