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

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

Issue 4980005: Allow sync with 2-factor StrongAuth accounts in ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Refactored 2-factor error passing Created 10 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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/profile_sync_service.h
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index d4cb576cf49dfb2b2ac6cc3bef32b72e41266d20..02ad336fb5d1dc3390c911a672fd1aa64427cae8 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -355,8 +355,9 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
bool ShouldPushChanges();
const GURL& sync_service_url() const { return sync_service_url_; }
+ SigninManager* signin() { return signin_.get(); }
John Gregg 2010/11/18 00:05:30 why are you making signin() public? Would rather
stevenjb 2010/11/18 00:11:09 I didn't add signin(), just cros_user() (I elimina
John Gregg 2010/11/18 00:22:51 Oh, never mind, read it incorrectly. The sync/bro
+ const std::string& cros_user() const { return cros_user_; }
- SigninManager* signin() { return &signin_; }
protected:
// Used by ProfileSyncServiceMock only.
//
@@ -463,7 +464,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
SyncSetupWizard wizard_;
// Encapsulates user signin with TokenService.
- SigninManager signin_;
+ scoped_ptr<SigninManager> signin_;
// True if an unrecoverable error (e.g. violation of an assumed invariant)
// occurred during syncer operation. This value should be checked before
« no previous file with comments | « chrome/browser/dom_ui/options/personal_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