Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Unified Diff: chrome/browser/sync/profile_sync_service.h

Issue 3655004: Add UI for setting the encryption passphrase.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fixes Created 10 years, 2 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 | « chrome/browser/dom_ui/options/sync_options_handler.cc ('k') | chrome/browser/sync/profile_sync_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service.h
===================================================================
--- chrome/browser/sync/profile_sync_service.h (revision 62207)
+++ chrome/browser/sync/profile_sync_service.h (working copy)
@@ -100,7 +100,7 @@
CANCEL_FROM_SIGNON_WITHOUT_AUTH = 10, // Cancelled before submitting
// username and password.
CANCEL_DURING_SIGNON = 11, // Cancelled after auth.
- CANCEL_FROM_CHOOSE_DATA_TYPES = 12, // Cancelled before choosing data
+ CANCEL_DURING_CONFIGURE = 12, // Cancelled before choosing data
// types and clicking OK.
// Events resulting in the stoppage of sync service.
STOP_FROM_OPTIONS = 20, // Sync was stopped from Wrench->Options.
@@ -220,7 +220,6 @@
return wizard_.IsVisible();
}
virtual void ShowLoginDialog(gfx::NativeWindow parent_window);
-
void ShowChooseDataTypes(gfx::NativeWindow parent_window);
// Pretty-printed strings for a given StatusSummary.
@@ -267,7 +266,7 @@
}
// The profile we are syncing for.
- Profile* profile() { return profile_; }
+ Profile* profile() const { return profile_; }
// Adds/removes an observer. ProfileSyncService does not take ownership of
// the observer.
@@ -329,6 +328,12 @@
// for sensitive data types.
virtual bool IsCryptographerReady() const;
+ // Returns true if a secondary passphrase is being used.
+ virtual bool IsUsingSecondaryPassphrase() const;
+
+ // Sets the secondary passphrase.
+ virtual void SetSecondaryPassphrase(const std::string& passphrase);
+
// Sets the Cryptographer's passphrase, or caches it until that is possible.
// This will check asynchronously whether the passphrase is valid and notify
// ProfileSyncServiceObservers via the NotificationService when the outcome
« no previous file with comments | « chrome/browser/dom_ui/options/sync_options_handler.cc ('k') | chrome/browser/sync/profile_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698