chrome/browser/sync/profile_sync_service.cc - Issue 8491051: Do nothing in EnableEncryptEverything()if encryption already enabled.

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/profile_sync_service.cc

Issue 8491051: Do nothing in EnableEncryptEverything()if encryption already enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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/profile_sync_service.cc

diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc

index e6a2cef071c94b85cac1d02346af4d41e81adbc1..a2e62cd825a802a366f4eab2079046bdfd8fd359 100644

--- a/chrome/browser/sync/profile_sync_service.cc

+++ b/chrome/browser/sync/profile_sync_service.cc

@@ -1326,7 +1326,8 @@ void ProfileSyncService::EnableEncryptEverything() {

// must check that instead of |backend_initialized_|.

// TODO(akalin): Fix the above. :/

DCHECK(sync_initialized());

- encryption_pending_ = true;

+ if (!encrypt_everything_)

+ encryption_pending_ = true;

}

bool ProfileSyncService::encryption_pending() const {

« no previous file with comments | « no previous file | no next file » | no next file with comments »