| OLD | NEW | 
|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 SYNC_SYNCABLE_SYNCABLE_ID_H_ | 5 #ifndef SYNC_SYNCABLE_SYNCABLE_ID_H_ | 
| 6 #define SYNC_SYNCABLE_SYNCABLE_ID_H_ | 6 #define SYNC_SYNCABLE_SYNCABLE_ID_H_ | 
| 7 | 7 | 
| 8 #include <iosfwd> | 8 #include <iosfwd> | 
| 9 #include <limits> | 9 #include <limits> | 
| 10 #include <sstream> | 10 #include <sstream> | 
| 11 #include <string> | 11 #include <string> | 
| 12 | 12 | 
|  | 13 #include "base/containers/hash_tables.h" | 
| 13 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" | 
| 14 #include "base/hash_tables.h" |  | 
| 15 #include "sync/base/sync_export.h" | 15 #include "sync/base/sync_export.h" | 
| 16 | 16 | 
| 17 class MockConnectionManager; | 17 class MockConnectionManager; | 
| 18 | 18 | 
| 19 namespace base { | 19 namespace base { | 
| 20 class StringValue; | 20 class StringValue; | 
| 21 } | 21 } | 
| 22 | 22 | 
| 23 namespace sql { | 23 namespace sql { | 
| 24 class Statement; | 24 class Statement; | 
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 123 | 123 | 
| 124   std::string s_; | 124   std::string s_; | 
| 125 }; | 125 }; | 
| 126 | 126 | 
| 127 SYNC_EXPORT_PRIVATE Id GetNullId(); | 127 SYNC_EXPORT_PRIVATE Id GetNullId(); | 
| 128 | 128 | 
| 129 }  // namespace syncable | 129 }  // namespace syncable | 
| 130 }  // namespace syncer | 130 }  // namespace syncer | 
| 131 | 131 | 
| 132 #endif  // SYNC_SYNCABLE_SYNCABLE_ID_H_ | 132 #endif  // SYNC_SYNCABLE_SYNCABLE_ID_H_ | 
| OLD | NEW | 
|---|