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

Unified Diff: chrome/browser/signin/signin_manager.h

Issue 12077030: Allow signin to continue even if sync is disabled by policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix windows sync integration test failure Created 7 years, 11 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/signin/signin_global_error_unittest.cc ('k') | chrome/browser/signin/signin_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/signin/signin_manager.h
diff --git a/chrome/browser/signin/signin_manager.h b/chrome/browser/signin/signin_manager.h
index 4d338efbeda5e006424492e23b126e462b4761ea..43a50254bbf99c26977e797f7d8f8bcc78bf4d84 100644
--- a/chrome/browser/signin/signin_manager.h
+++ b/chrome/browser/signin/signin_manager.h
@@ -91,7 +91,7 @@ class SigninManager : public GaiaAuthConsumer,
// If a user has previously established a username and SignOut has not been
// called, this will return the username.
// Otherwise, it will return an empty string.
- const std::string& GetAuthenticatedUsername();
+ const std::string& GetAuthenticatedUsername() const;
// Sets the user name. Note: |username| should be already authenticated as
// this is a sticky operation (in contrast to StartSignIn).
@@ -171,6 +171,10 @@ class SigninManager : public GaiaAuthConsumer,
return signin_global_error_.get();
}
+ const SigninGlobalError* signin_global_error() const {
+ return signin_global_error_.get();
+ }
+
// ProfileKeyedService implementation.
virtual void Shutdown() OVERRIDE;
@@ -273,7 +277,7 @@ class SigninManager : public GaiaAuthConsumer,
ClientOAuthResult temp_oauth_login_tokens_;
// The list of SigninDiagnosticObservers.
- ObserverList<signin_internals_util::SigninDiagnosticsObserver>
+ ObserverList<signin_internals_util::SigninDiagnosticsObserver, true>
signin_diagnostics_observers_;
base::WeakPtrFactory<SigninManager> weak_pointer_factory_;
« no previous file with comments | « chrome/browser/signin/signin_global_error_unittest.cc ('k') | chrome/browser/signin/signin_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698