| OLD | NEW |
| 1 // Copyright (c) 2011 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_SYNCER_H_ | 5 #ifndef CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_ |
| 6 #define CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_ | 6 #define CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
| 13 #include "base/callback.h" | 13 #include "base/callback.h" |
| 14 #include "base/gtest_prod_util.h" | 14 #include "base/gtest_prod_util.h" |
| 15 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
| 16 #include "base/synchronization/lock.h" | 16 #include "base/synchronization/lock.h" |
| 17 #include "chrome/browser/sync/engine/conflict_resolver.h" | 17 #include "chrome/browser/sync/engine/conflict_resolver.h" |
| 18 #include "chrome/browser/sync/engine/syncer_types.h" | 18 #include "chrome/browser/sync/engine/syncer_types.h" |
| 19 #include "chrome/browser/sync/engine/syncproto.h" | 19 #include "chrome/browser/sync/engine/syncproto.h" |
| 20 #include "chrome/browser/sync/sessions/sync_session.h" | 20 #include "chrome/browser/sync/sessions/sync_session.h" |
| 21 #include "chrome/browser/sync/syncable/directory_event.h" | 21 #include "chrome/browser/sync/syncable/directory_event.h" |
| 22 #include "chrome/browser/sync/syncable/model_type.h" | 22 #include "chrome/browser/sync/syncable/model_type.h" |
| 23 #include "chrome/browser/sync/util/extensions_activity_monitor.h" | 23 #include "chrome/browser/sync/util/extensions_activity_monitor.h" |
| 24 #include "chrome/common/deprecated/event_sys.h" | |
| 25 #include "chrome/common/deprecated/event_sys-inl.h" | |
| 26 | 24 |
| 27 namespace syncable { | 25 namespace syncable { |
| 28 class Directory; | 26 class Directory; |
| 29 class DirectoryManager; | 27 class DirectoryManager; |
| 30 class Entry; | 28 class Entry; |
| 31 class Id; | 29 class Id; |
| 32 class MutableEntry; | 30 class MutableEntry; |
| 33 class WriteTransaction; | 31 class WriteTransaction; |
| 34 } // namespace syncable | 32 } // namespace syncable |
| 35 | 33 |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 DISALLOW_COPY_AND_ASSIGN(Syncer); | 125 DISALLOW_COPY_AND_ASSIGN(Syncer); |
| 128 }; | 126 }; |
| 129 | 127 |
| 130 // Utility function declarations. | 128 // Utility function declarations. |
| 131 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest); | 129 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest); |
| 132 void ClearServerData(syncable::MutableEntry* entry); | 130 void ClearServerData(syncable::MutableEntry* entry); |
| 133 | 131 |
| 134 } // namespace browser_sync | 132 } // namespace browser_sync |
| 135 | 133 |
| 136 #endif // CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_ | 134 #endif // CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_ |
| 137 | |
| OLD | NEW |