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

Side by Side Diff: components/sync/syncable/base_node.cc

Issue 2407163004: [Sync] Move some directory-related things from core/ to syncable/. (Closed)
Patch Set: Created 4 years, 2 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
« no previous file with comments | « components/sync/syncable/base_node.h ('k') | components/sync/syncable/base_transaction.h » ('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 #include "components/sync/core/base_node.h" 5 #include "components/sync/syncable/base_node.h"
6 6
7 #include <stack> 7 #include <stack>
8 8
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "components/sync/base/time.h" 11 #include "components/sync/base/time.h"
12 #include "components/sync/core/base_transaction.h"
13 #include "components/sync/core_impl/syncapi_internal.h" 12 #include "components/sync/core_impl/syncapi_internal.h"
14 #include "components/sync/protocol/app_specifics.pb.h" 13 #include "components/sync/protocol/app_specifics.pb.h"
15 #include "components/sync/protocol/autofill_specifics.pb.h" 14 #include "components/sync/protocol/autofill_specifics.pb.h"
16 #include "components/sync/protocol/bookmark_specifics.pb.h" 15 #include "components/sync/protocol/bookmark_specifics.pb.h"
17 #include "components/sync/protocol/extension_specifics.pb.h" 16 #include "components/sync/protocol/extension_specifics.pb.h"
18 #include "components/sync/protocol/nigori_specifics.pb.h" 17 #include "components/sync/protocol/nigori_specifics.pb.h"
19 #include "components/sync/protocol/password_specifics.pb.h" 18 #include "components/sync/protocol/password_specifics.pb.h"
20 #include "components/sync/protocol/session_specifics.pb.h" 19 #include "components/sync/protocol/session_specifics.pb.h"
21 #include "components/sync/protocol/theme_specifics.pb.h" 20 #include "components/sync/protocol/theme_specifics.pb.h"
22 #include "components/sync/protocol/typed_url_specifics.pb.h" 21 #include "components/sync/protocol/typed_url_specifics.pb.h"
22 #include "components/sync/syncable/base_transaction.h"
23 #include "components/sync/syncable/directory.h" 23 #include "components/sync/syncable/directory.h"
24 #include "components/sync/syncable/entry.h" 24 #include "components/sync/syncable/entry.h"
25 #include "components/sync/syncable/syncable_base_transaction.h" 25 #include "components/sync/syncable/syncable_base_transaction.h"
26 #include "components/sync/syncable/syncable_id.h" 26 #include "components/sync/syncable/syncable_id.h"
27 27
28 using sync_pb::AutofillProfileSpecifics; 28 using sync_pb::AutofillProfileSpecifics;
29 29
30 namespace syncer { 30 namespace syncer {
31 31
32 using syncable::SPECIFICS; 32 using syncable::SPECIFICS;
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 const sync_pb::EntitySpecifics& specifics) { 276 const sync_pb::EntitySpecifics& specifics) {
277 ModelType type = GetModelTypeFromSpecifics(specifics); 277 ModelType type = GetModelTypeFromSpecifics(specifics);
278 DCHECK_NE(UNSPECIFIED, type); 278 DCHECK_NE(UNSPECIFIED, type);
279 if (GetModelType() != UNSPECIFIED) { 279 if (GetModelType() != UNSPECIFIED) {
280 DCHECK_EQ(GetModelType(), type); 280 DCHECK_EQ(GetModelType(), type);
281 } 281 }
282 unencrypted_data_.CopyFrom(specifics); 282 unencrypted_data_.CopyFrom(specifics);
283 } 283 }
284 284
285 } // namespace syncer 285 } // namespace syncer
OLDNEW
« no previous file with comments | « components/sync/syncable/base_node.h ('k') | components/sync/syncable/base_transaction.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698