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

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

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_manager.h ('k') | chrome/browser/signin/signin_manager_fake.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/signin/signin_manager.cc
diff --git a/chrome/browser/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc
index 9f9a0c2f2f5c39a15ae4f7272f06795e52d09f09..aeddf44ac928dd1be621ebffa484338da9afc576 100644
--- a/chrome/browser/signin/signin_manager.cc
+++ b/chrome/browser/signin/signin_manager.cc
@@ -201,7 +201,7 @@ void SigninManager::Initialize(Profile* profile) {
// Should never call Initialize() twice.
DCHECK(!IsInitialized());
profile_ = profile;
- signin_global_error_.reset(new SigninGlobalError(profile));
+ signin_global_error_.reset(new SigninGlobalError(this, profile));
GlobalErrorServiceFactory::GetForProfile(profile_)->AddGlobalError(
signin_global_error_.get());
PrefService* local_state = g_browser_process->local_state();
@@ -274,7 +274,7 @@ void SigninManager::CleanupNotificationRegistration() {
#endif
}
-const std::string& SigninManager::GetAuthenticatedUsername() {
+const std::string& SigninManager::GetAuthenticatedUsername() const {
return authenticated_username_;
}
« no previous file with comments | « chrome/browser/signin/signin_manager.h ('k') | chrome/browser/signin/signin_manager_fake.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698