components/sync/driver/glue/sync_backend_host_impl.cc - Issue 2279713002: Make PassphraseType a "enum class" instead of "enum".

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: components/sync/driver/glue/sync_backend_host_impl.cc

Issue 2279713002: Make PassphraseType a "enum class" instead of "enum". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix java Created 4 years, 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/sync/core_impl/sync_manager_impl_unittest.cc ('k') | components/sync/driver/glue/sync_backend_host_mock.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/sync/driver/glue/sync_backend_host_impl.cc

diff --git a/components/sync/driver/glue/sync_backend_host_impl.cc b/components/sync/driver/glue/sync_backend_host_impl.cc

index 011695920021c69a71198c7a5eea9759069f17f3..7360b1fb07034087c1418bdbb459e5fdee2ad647 100644

--- a/components/sync/driver/glue/sync_backend_host_impl.cc

+++ b/components/sync/driver/glue/sync_backend_host_impl.cc

@@ -59,7 +59,7 @@ SyncBackendHostImpl::SyncBackendHostImpl(

initialized_(false),

sync_prefs_(sync_prefs),

frontend_(NULL),

- cached_passphrase_type_(syncer::IMPLICIT_PASSPHRASE),

+ cached_passphrase_type_(syncer::PassphraseType::IMPLICIT_PASSPHRASE),

invalidator_(invalidator),

invalidation_handler_registered_(false),

weak_ptr_factory_(this) {

@@ -177,8 +177,9 @@ void SyncBackendHostImpl::SetEncryptionPassphrase(const std::string& passphrase,

// SetEncryptionPassphrase should never be called if we are currently

// encrypted with an explicit passphrase.

- DCHECK(cached_passphrase_type_ == syncer::KEYSTORE_PASSPHRASE ||

- cached_passphrase_type_ == syncer::IMPLICIT_PASSPHRASE);

+ DCHECK(

+ cached_passphrase_type_ == syncer::PassphraseType::KEYSTORE_PASSPHRASE ||

+ cached_passphrase_type_ == syncer::PassphraseType::IMPLICIT_PASSPHRASE);

// Post an encryption task on the syncer thread.

registrar_->sync_thread()->task_runner()->PostTask(

« no previous file with comments | « components/sync/core_impl/sync_manager_impl_unittest.cc ('k') | components/sync/driver/glue/sync_backend_host_mock.cc » ('j') | no next file with comments »