sync/internal_api/base_node.cc - Issue 10534080: sync: move internal_api components used by chrome/browser into internal_api/public

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10534080: sync: move internal_api components used by chrome/browser into internal_api/public (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix test Created 8 years, 6 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/internal_api/base_node.h ('k') | sync/internal_api/base_transaction.h » ('j') | no next file with comments »

OLD	NEW
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/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/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"

(...skipping 322 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
345 const sync_pb::EntitySpecifics& specifics) {	345 const sync_pb::EntitySpecifics& specifics) {

346 syncable::ModelType type = syncable::GetModelTypeFromSpecifics(specifics);	346 syncable::ModelType type = syncable::GetModelTypeFromSpecifics(specifics);

347 DCHECK_NE(syncable::UNSPECIFIED, type);	347 DCHECK_NE(syncable::UNSPECIFIED, type);

348 if (GetModelType() != syncable::UNSPECIFIED) {	348 if (GetModelType() != syncable::UNSPECIFIED) {

349 DCHECK_EQ(GetModelType(), type);	349 DCHECK_EQ(GetModelType(), type);

350 }	350 }

351 unencrypted_data_.CopyFrom(specifics);	351 unencrypted_data_.CopyFrom(specifics);

352 }	352 }

353	353

354 } // namespace sync_api	354 } // namespace sync_api

OLD	NEW