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

Side by Side Diff: sync/api/sync_data.h

Issue 10690071: [Sync] Move model_type* from syncable/ to base/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months 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
« no previous file with comments | « chrome/browser/sync/user_selectable_sync_type.h ('k') | sync/api/sync_data.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_API_SYNC_DATA_H_ 5 #ifndef SYNC_API_SYNC_DATA_H_
6 #define SYNC_API_SYNC_DATA_H_ 6 #define SYNC_API_SYNC_DATA_H_
7 #pragma once 7 #pragma once
8 8
9 #include <iosfwd> 9 #include <iosfwd>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "sync/internal_api/public/syncable/model_type.h" 14 #include "sync/internal_api/public/base/model_type.h"
15 #include "sync/internal_api/public/util/immutable.h" 15 #include "sync/internal_api/public/util/immutable.h"
16 16
17 namespace sync_pb { 17 namespace sync_pb {
18 class EntitySpecifics; 18 class EntitySpecifics;
19 class SyncEntity; 19 class SyncEntity;
20 } // namespace sync_pb 20 } // namespace sync_pb
21 21
22 namespace syncer { 22 namespace syncer {
23 23
24 typedef syncable::ModelType SyncDataType; 24 typedef syncable::ModelType SyncDataType;
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 // The actual shared sync entity being held. 116 // The actual shared sync entity being held.
117 ImmutableSyncEntity immutable_entity_; 117 ImmutableSyncEntity immutable_entity_;
118 }; 118 };
119 119
120 // gmock printer helper. 120 // gmock printer helper.
121 void PrintTo(const SyncData& sync_data, std::ostream* os); 121 void PrintTo(const SyncData& sync_data, std::ostream* os);
122 122
123 } // namespace syncer 123 } // namespace syncer
124 124
125 #endif // SYNC_API_SYNC_DATA_H_ 125 #endif // SYNC_API_SYNC_DATA_H_
OLDNEW
« no previous file with comments | « chrome/browser/sync/user_selectable_sync_type.h ('k') | sync/api/sync_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698