| OLD | NEW |
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 COMPONENTS_SYNC_API_ENTITY_DATA_H_ | 5 #ifndef COMPONENTS_SYNC_API_ENTITY_DATA_H_ |
| 6 #define COMPONENTS_SYNC_API_ENTITY_DATA_H_ | 6 #define COMPONENTS_SYNC_API_ENTITY_DATA_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> |
| 9 #include <string> | 10 #include <string> |
| 10 #include <vector> | 11 #include <vector> |
| 11 | 12 |
| 12 #include "base/macros.h" | 13 #include "base/macros.h" |
| 13 #include "base/time/time.h" | 14 #include "base/time/time.h" |
| 14 #include "base/values.h" | 15 #include "base/values.h" |
| 15 #include "components/sync/base/proto_value_ptr.h" | 16 #include "components/sync/base/proto_value_ptr.h" |
| 16 #include "components/sync/protocol/sync.pb.h" | 17 #include "components/sync/protocol/sync.pb.h" |
| 17 | 18 |
| 18 namespace syncer { | 19 namespace syncer { |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 friend struct EntityDataTraits; | 83 friend struct EntityDataTraits; |
| 83 // Used to transfer the data without copying. | 84 // Used to transfer the data without copying. |
| 84 void Swap(EntityData* other); | 85 void Swap(EntityData* other); |
| 85 | 86 |
| 86 DISALLOW_COPY_AND_ASSIGN(EntityData); | 87 DISALLOW_COPY_AND_ASSIGN(EntityData); |
| 87 }; | 88 }; |
| 88 | 89 |
| 89 } // namespace syncer | 90 } // namespace syncer |
| 90 | 91 |
| 91 #endif // COMPONENTS_SYNC_API_ENTITY_DATA_H_ | 92 #endif // COMPONENTS_SYNC_API_ENTITY_DATA_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2389063002:
[Sync] Fixing easy lint violations. (Closed)
