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

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: chrome/browser/sync/util/user_settings.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:

Index: chrome/browser/sync/util/user_settings.cc

diff --git a/chrome/browser/sync/util/user_settings.cc b/chrome/browser/sync/util/user_settings.cc

index 2ab090e639f276da855e34889c6a407efcdd45da..2396475a641787be5ede6dde8f5d790170f46784 100644

--- a/chrome/browser/sync/util/user_settings.cc

+++ b/chrome/browser/sync/util/user_settings.cc

@@ -22,7 +22,7 @@

#include "base/rand_util.h"

#include "base/string_util.h"

#include "chrome/browser/sync/syncable/directory_manager.h" // For migration.

-#include "chrome/browser/sync/util/data_encryption.h"

+#include "chrome/browser/sync/encryption/data_encryption.h"

#include "chrome/browser/sync/util/sqlite_utils.h"

#include "chrome/common/random.h"