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

Side by Side Diff: sync/internal_api/base_node.cc

Issue 10699044: [Sync] Move sync/{internal_api,syncable} into syncer namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync to head 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 | « sync/engine/verify_updates_command.h ('k') | sync/internal_api/change_record.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 #include "sync/internal_api/public/base_node.h" 5 #include "sync/internal_api/public/base_node.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/sha1.h" 8 #include "base/sha1.h"
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "sync/internal_api/public/base_transaction.h" 12 #include "sync/internal_api/public/base_transaction.h"
13 #include "sync/internal_api/syncapi_internal.h" 13 #include "sync/internal_api/syncapi_internal.h"
14 #include "sync/protocol/app_specifics.pb.h" 14 #include "sync/protocol/app_specifics.pb.h"
15 #include "sync/protocol/autofill_specifics.pb.h" 15 #include "sync/protocol/autofill_specifics.pb.h"
16 #include "sync/protocol/bookmark_specifics.pb.h" 16 #include "sync/protocol/bookmark_specifics.pb.h"
17 #include "sync/protocol/extension_specifics.pb.h" 17 #include "sync/protocol/extension_specifics.pb.h"
18 #include "sync/protocol/nigori_specifics.pb.h" 18 #include "sync/protocol/nigori_specifics.pb.h"
19 #include "sync/protocol/password_specifics.pb.h" 19 #include "sync/protocol/password_specifics.pb.h"
20 #include "sync/protocol/session_specifics.pb.h" 20 #include "sync/protocol/session_specifics.pb.h"
21 #include "sync/protocol/theme_specifics.pb.h" 21 #include "sync/protocol/theme_specifics.pb.h"
22 #include "sync/protocol/typed_url_specifics.pb.h" 22 #include "sync/protocol/typed_url_specifics.pb.h"
23 #include "sync/syncable/directory.h" 23 #include "sync/syncable/directory.h"
24 #include "sync/syncable/entry.h" 24 #include "sync/syncable/entry.h"
25 #include "sync/syncable/syncable_id.h" 25 #include "sync/syncable/syncable_id.h"
26 #include "sync/util/time.h" 26 #include "sync/util/time.h"
27 27
28 using syncable::SPECIFICS;
29 using sync_pb::AutofillProfileSpecifics; 28 using sync_pb::AutofillProfileSpecifics;
30 29
31 namespace syncer { 30 namespace syncer {
32 31
32 using syncable::SPECIFICS;
33
33 // Helper function to look up the int64 metahandle of an object given the ID 34 // Helper function to look up the int64 metahandle of an object given the ID
34 // string. 35 // string.
35 static int64 IdToMetahandle(syncable::BaseTransaction* trans, 36 static int64 IdToMetahandle(syncable::BaseTransaction* trans,
36 const syncable::Id& id) { 37 const syncable::Id& id) {
37 syncable::Entry entry(trans, syncable::GET_BY_ID, id); 38 syncable::Entry entry(trans, syncable::GET_BY_ID, id);
38 if (!entry.good()) 39 if (!entry.good())
39 return kInvalidId; 40 return kInvalidId;
40 return entry.Get(syncable::META_HANDLE); 41 return entry.Get(syncable::META_HANDLE);
41 } 42 }
42 43
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 const sync_pb::EntitySpecifics& specifics) { 347 const sync_pb::EntitySpecifics& specifics) {
347 syncable::ModelType type = syncable::GetModelTypeFromSpecifics(specifics); 348 syncable::ModelType type = syncable::GetModelTypeFromSpecifics(specifics);
348 DCHECK_NE(syncable::UNSPECIFIED, type); 349 DCHECK_NE(syncable::UNSPECIFIED, type);
349 if (GetModelType() != syncable::UNSPECIFIED) { 350 if (GetModelType() != syncable::UNSPECIFIED) {
350 DCHECK_EQ(GetModelType(), type); 351 DCHECK_EQ(GetModelType(), type);
351 } 352 }
352 unencrypted_data_.CopyFrom(specifics); 353 unencrypted_data_.CopyFrom(specifics);
353 } 354 }
354 355
355 } // namespace syncer 356 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/engine/verify_updates_command.h ('k') | sync/internal_api/change_record.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698