chrome/browser/sync/js_sync_manager_observer.h - Issue 6902101: Refactor sync passphrase setup flow and fix passphrase tests

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/js_sync_manager_observer.h

Issue 6902101: Refactor sync passphrase setup flow and fix passphrase tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove OnPassphraseFailed; Plumb enum all the way through; Shave yak. Created 9 years, 8 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:

Index: chrome/browser/sync/js_sync_manager_observer.h

diff --git a/chrome/browser/sync/js_sync_manager_observer.h b/chrome/browser/sync/js_sync_manager_observer.h

index 9436f524c9928d0e31692e6889feaec426476f91..597b3a87bb09a495543388a13947b84a84232771 100644

--- a/chrome/browser/sync/js_sync_manager_observer.h

+++ b/chrome/browser/sync/js_sync_manager_observer.h

@@ -34,8 +34,7 @@ class JsSyncManagerObserver : public sync_api::SyncManager::Observer {

const sessions::SyncSessionSnapshot* snapshot);

virtual void OnAuthError(const GoogleServiceAuthError& auth_error);

virtual void OnUpdatedToken(const std::string& token);

- virtual void OnPassphraseRequired(bool for_decryption);

- virtual void OnPassphraseFailed();

+ virtual void OnPassphraseRequired(sync_api::PassphraseRequiredReason reason);

virtual void OnPassphraseAccepted(const std::string& bootstrap_token);

virtual void OnEncryptionComplete(

const syncable::ModelTypeSet& encrypted_types);