Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

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

Issue 8537003: Cleanup: Remove unneeded forward declarations in chrome/browser/sync. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #pragma once 7 #pragma once
8 8
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "chrome/browser/sync/engine/model_changing_syncer_command.h" 12 #include "chrome/browser/sync/engine/model_changing_syncer_command.h"
13 #include "chrome/browser/sync/engine/model_safe_worker.h" 13 #include "chrome/browser/sync/engine/model_safe_worker.h"
14 14
15 namespace syncable { 15 namespace syncable {
16 class BaseTransaction; 16 class BaseTransaction;
17 class Entry; 17 class Entry;
18 class Id; 18 class Id;
19 class MutableEntry;
20 class WriteTransaction; 19 class WriteTransaction;
21 } // namespace syncable 20 } // namespace syncable
22 21
23 namespace browser_sync { 22 namespace browser_sync {
24 23
25 class ConflictResolver; 24 class ConflictResolver;
26 class Cryptographer; 25 class Cryptographer;
27 26
28 namespace sessions { 27 namespace sessions {
29 class ConflictProgress; 28 class ConflictProgress;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 void MergeSetsForPositionUpdate(syncable::BaseTransaction* trans, 66 void MergeSetsForPositionUpdate(syncable::BaseTransaction* trans,
68 syncable::Entry* entry, 67 syncable::Entry* entry,
69 sessions::ConflictProgress* conflict_progress); 68 sessions::ConflictProgress* conflict_progress);
70 69
71 DISALLOW_COPY_AND_ASSIGN(BuildAndProcessConflictSetsCommand); 70 DISALLOW_COPY_AND_ASSIGN(BuildAndProcessConflictSetsCommand);
72 }; 71 };
73 72
74 } // namespace browser_sync 73 } // namespace browser_sync
75 74
76 #endif // CHROME_BROWSER_SYNC_ENGINE_BUILD_AND_PROCESS_CONFLICT_SETS_COMMAND_H_ 75 #endif // CHROME_BROWSER_SYNC_ENGINE_BUILD_AND_PROCESS_CONFLICT_SETS_COMMAND_H_
OLDNEW
« no previous file with comments | « chrome/browser/sync/engine/apply_updates_command.h ('k') | chrome/browser/sync/engine/clear_data_command.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698