chrome/browser/sync/engine/build_and_process_conflict_sets_command.h - Issue 211019: Fix compiling of sync on linux.

Side by Side Diff: chrome/browser/sync/engine/build_and_process_conflict_sets_command.h

Issue 211019: Fix compiling of sync on linux. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 11 years, 3 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

OLD	NEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2006-2009 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_ENGINE_BUILD_AND_PROCESS_CONFLICT_SETS_COMMAND_H_	5 #ifndef CHROME_BROWSER_SYNC_ENGINE_BUILD_AND_PROCESS_CONFLICT_SETS_COMMAND_H_

6 #define CHROME_BROWSER_SYNC_ENGINE_BUILD_AND_PROCESS_CONFLICT_SETS_COMMAND_H_	6 #define CHROME_BROWSER_SYNC_ENGINE_BUILD_AND_PROCESS_CONFLICT_SETS_COMMAND_H_

7	7

8 #include <vector>	8 #include <vector>

9	9

10 #include "base/basictypes.h"	10 #include "base/basictypes.h"

(...skipping 21 matching lines...) Expand all Loading...
32	32

33 private:	33 private:

34 bool BuildAndProcessConflictSets(SyncerSession* session);	34 bool BuildAndProcessConflictSets(SyncerSession* session);

35	35

36 bool ProcessSingleDirectionConflictSets(	36 bool ProcessSingleDirectionConflictSets(

37 syncable::WriteTransaction* trans, SyncerSession* const session);	37 syncable::WriteTransaction* trans, SyncerSession* const session);

38 bool ApplyUpdatesTransactionally(	38 bool ApplyUpdatesTransactionally(

39 syncable::WriteTransaction* trans,	39 syncable::WriteTransaction* trans,

40 const std::vector<syncable::Id>* const update_set,	40 const std::vector<syncable::Id>* const update_set,

41 SyncerSession* const session);	41 SyncerSession* const session);

42 void BuildAndProcessConflictSetsCommand::BuildConflictSets(	42 void BuildConflictSets(syncable::BaseTransaction* trans,

43 syncable::BaseTransaction* trans,	43 ConflictResolutionView* view);

44 ConflictResolutionView* view);

45	44

46 void MergeSetsForNameClash(syncable::BaseTransaction* trans,	45 void MergeSetsForNameClash(syncable::BaseTransaction* trans,

47 syncable::Entry* entry,	46 syncable::Entry* entry,

48 ConflictResolutionView* view);	47 ConflictResolutionView* view);

49 void MergeSetsForIntroducedLoops(syncable::BaseTransaction* trans,	48 void MergeSetsForIntroducedLoops(syncable::BaseTransaction* trans,

50 syncable::Entry* entry,	49 syncable::Entry* entry,

51 ConflictResolutionView* view);	50 ConflictResolutionView* view);

52 void MergeSetsForNonEmptyDirectories(syncable::BaseTransaction* trans,	51 void MergeSetsForNonEmptyDirectories(syncable::BaseTransaction* trans,

53 syncable::Entry* entry,	52 syncable::Entry* entry,

54 ConflictResolutionView* view);	53 ConflictResolutionView* view);

55 void MergeSetsForPositionUpdate(syncable::BaseTransaction* trans,	54 void MergeSetsForPositionUpdate(syncable::BaseTransaction* trans,

56 syncable::Entry* entry,	55 syncable::Entry* entry,

57 ConflictResolutionView* view);	56 ConflictResolutionView* view);

58	57

59 DISALLOW_COPY_AND_ASSIGN(BuildAndProcessConflictSetsCommand);	58 DISALLOW_COPY_AND_ASSIGN(BuildAndProcessConflictSetsCommand);

60 };	59 };

61	60

62 } // namespace browser_sync	61 } // namespace browser_sync

63	62

64 #endif // CHROME_BROWSER_SYNC_ENGINE_BUILD_AND_PROCESS_CONFLICT_SETS_COMMAND_H_	63 #endif // CHROME_BROWSER_SYNC_ENGINE_BUILD_AND_PROCESS_CONFLICT_SETS_COMMAND_H_

OLD	NEW