| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 <string> | |
| 10 #include <utility> | 9 #include <utility> |
| 11 #include <vector> | 10 #include <vector> |
| 12 | 11 |
| 13 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
| 14 #include "base/callback.h" | 13 #include "base/callback.h" |
| 15 #include "base/gtest_prod_util.h" | 14 #include "base/gtest_prod_util.h" |
| 16 #include "base/lock.h" | 15 #include "base/lock.h" |
| 17 #include "base/scoped_ptr.h" | 16 #include "base/scoped_ptr.h" |
| 18 #include "chrome/browser/sync/engine/conflict_resolver.h" | 17 #include "chrome/browser/sync/engine/conflict_resolver.h" |
| 19 #include "chrome/browser/sync/engine/syncer_types.h" | 18 #include "chrome/browser/sync/engine/syncer_types.h" |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 } | 211 } |
| 213 return false; | 212 return false; |
| 214 } | 213 } |
| 215 // Utility function declarations. | 214 // Utility function declarations. |
| 216 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest); | 215 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest); |
| 217 void ClearServerData(syncable::MutableEntry* entry); | 216 void ClearServerData(syncable::MutableEntry* entry); |
| 218 | 217 |
| 219 } // namespace browser_sync | 218 } // namespace browser_sync |
| 220 | 219 |
| 221 #endif // CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_ | 220 #endif // CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_ |
| OLD | NEW |