chrome/browser/sync/internal_api/write_node.cc - Issue 8468023: Move encryption related files from util folder to encryption folder.

Side by Side Diff: chrome/browser/sync/internal_api/write_node.cc

Issue 8468023: Move encryption related files from util folder to encryption folder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: For review. Created 9 years, 1 month 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

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 "chrome/browser/sync/internal_api/write_node.h"	5 #include "chrome/browser/sync/internal_api/write_node.h"

6	6

7 #include "base/json/json_writer.h"	7 #include "base/json/json_writer.h"

8 #include "base/utf_string_conversions.h"	8 #include "base/utf_string_conversions.h"

9 #include "base/values.h"	9 #include "base/values.h"

10 #include "chrome/browser/sync/engine/nigori_util.h"	10 #include "chrome/browser/sync/engine/nigori_util.h"

11 #include "chrome/browser/sync/engine/syncapi_internal.h"	11 #include "chrome/browser/sync/engine/syncapi_internal.h"

12 #include "chrome/browser/sync/internal_api/base_transaction.h"	12 #include "chrome/browser/sync/internal_api/base_transaction.h"

13 #include "chrome/browser/sync/internal_api/write_transaction.h"	13 #include "chrome/browser/sync/internal_api/write_transaction.h"

14 #include "chrome/browser/sync/protocol/app_specifics.pb.h"	14 #include "chrome/browser/sync/protocol/app_specifics.pb.h"

15 #include "chrome/browser/sync/protocol/autofill_specifics.pb.h"	15 #include "chrome/browser/sync/protocol/autofill_specifics.pb.h"

16 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"	16 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"

17 #include "chrome/browser/sync/protocol/extension_specifics.pb.h"	17 #include "chrome/browser/sync/protocol/extension_specifics.pb.h"

18 #include "chrome/browser/sync/protocol/password_specifics.pb.h"	18 #include "chrome/browser/sync/protocol/password_specifics.pb.h"

19 #include "chrome/browser/sync/protocol/session_specifics.pb.h"	19 #include "chrome/browser/sync/protocol/session_specifics.pb.h"

20 #include "chrome/browser/sync/protocol/theme_specifics.pb.h"	20 #include "chrome/browser/sync/protocol/theme_specifics.pb.h"

21 #include "chrome/browser/sync/protocol/typed_url_specifics.pb.h"	21 #include "chrome/browser/sync/protocol/typed_url_specifics.pb.h"

22 #include "chrome/browser/sync/syncable/syncable.h"	22 #include "chrome/browser/sync/syncable/syncable.h"

23 #include "chrome/browser/sync/util/cryptographer.h"	23 #include "chrome/browser/sync/encryption/cryptographer.h"

24	24

25 using browser_sync::Cryptographer;	25 using browser_sync::Cryptographer;

26 using std::string;	26 using std::string;

27 using std::vector;	27 using std::vector;

28 using syncable::kEncryptedString;	28 using syncable::kEncryptedString;

29 using syncable::SPECIFICS;	29 using syncable::SPECIFICS;

30	30

31 namespace sync_api {	31 namespace sync_api {

32	32

33 static const char kDefaultNameForNewNodes[] = " ";	33 static const char kDefaultNameForNewNodes[] = " ";

(...skipping 484 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
518 sync_pb::BookmarkSpecifics new_value = GetBookmarkSpecifics();	518 sync_pb::BookmarkSpecifics new_value = GetBookmarkSpecifics();

519 new_value.set_favicon(bytes.empty() ? NULL : &bytes[0], bytes.size());	519 new_value.set_favicon(bytes.empty() ? NULL : &bytes[0], bytes.size());

520 SetBookmarkSpecifics(new_value);	520 SetBookmarkSpecifics(new_value);

521 }	521 }

522	522

523 void WriteNode::MarkForSyncing() {	523 void WriteNode::MarkForSyncing() {

524 syncable::MarkForSyncing(entry_);	524 syncable::MarkForSyncing(entry_);

525 }	525 }

526	526

527 } // namespace sync_api	527 } // namespace sync_api

OLD	NEW