sync/internal_api/sync_encryption_handler_impl.cc - Issue 11638018: [sync] Componentize sync: Part 5: Eliminate filename collisions in sync.gyp

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

Unified Diff: sync/internal_api/sync_encryption_handler_impl.cc

Issue 11638018: [sync] Componentize sync: Part 5: Eliminate filename collisions in sync.gyp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove comments Created 8 years 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 side-by-side diff with in-line comments

Download patch

Index: sync/internal_api/sync_encryption_handler_impl.cc

diff --git a/sync/internal_api/sync_encryption_handler_impl.cc b/sync/internal_api/sync_encryption_handler_impl.cc

index 852f5b697dcd1bbdb3088bbca00680b2e29e155c..82b75b87da99696ff696ed7a91ccc1b4263351ea 100644

--- a/sync/internal_api/sync_encryption_handler_impl.cc

+++ b/sync/internal_api/sync_encryption_handler_impl.cc

@@ -1,4 +1,4 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

@@ -24,10 +24,10 @@

#include "sync/protocol/encryption.pb.h"

#include "sync/protocol/nigori_specifics.pb.h"

#include "sync/protocol/sync.pb.h"

-#include "sync/syncable/base_transaction.h"

#include "sync/syncable/directory.h"

#include "sync/syncable/entry.h"

#include "sync/syncable/nigori_util.h"

+#include "sync/syncable/syncable_base_transaction.h"

#include "sync/util/cryptographer.h"

#include "sync/util/encryptor.h"

#include "sync/util/time.h"

« no previous file with comments | « sync/internal_api/read_transaction.cc ('k') | sync/internal_api/sync_encryption_handler_impl_unittest.cc » ('j') | no next file with comments »