Chromium Code Reviews| Index: chrome/browser/signin/signin_manager.cc |
| diff --git a/chrome/browser/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc |
| index 6d09ce3ca2758bab61de2ffdfd41dbb5208d42f3..19c76aa96afdcf32713a426efcc0ad751abd3913 100644 |
| --- a/chrome/browser/signin/signin_manager.cc |
| +++ b/chrome/browser/signin/signin_manager.cc |
| @@ -16,9 +16,7 @@ |
| #include "chrome/browser/profiles/profile_io_data.h" |
| #include "chrome/browser/signin/about_signin_internals.h" |
| #include "chrome/browser/signin/about_signin_internals_factory.h" |
| -#include "chrome/browser/signin/local_auth.h" |
| #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
| -#include "chrome/browser/signin/signin_account_id_helper.h" |
| #include "chrome/browser/signin/signin_internals_util.h" |
| #include "chrome/browser/signin/signin_manager_factory.h" |
| #include "chrome/common/pref_names.h" |
| @@ -303,7 +301,7 @@ void SigninManager::Initialize(Profile* profile, PrefService* local_state) { |
| } |
| InitTokenService(); |
| - account_id_helper_.reset(new SigninAccountIdHelper(this)); |
| + client_->SigninManagerInitialized(this); |
| } |
| void SigninManager::Shutdown() { |
| @@ -311,7 +309,7 @@ void SigninManager::Shutdown() { |
| merge_session_helper_->CancelAll(); |
| local_state_pref_registrar_.RemoveAll(); |
| - account_id_helper_.reset(); |
| + client_->SigninManagerShutdown(this); |
|
Roger Tawa OOO till Jul 10th
2014/03/24 14:10:08
At this point, the SM is sort of like half shutdow
|
| SigninManagerBase::Shutdown(); |
| } |
| @@ -444,11 +442,7 @@ void SigninManager::OnSignedIn(const std::string& username) { |
| GoogleSigninSucceeded(GetAuthenticatedUsername(), |
| password_)); |
| -#if !defined(OS_ANDROID) |
| - // Don't store password hash except for users of new profile features. |
| - if (switches::IsNewProfileManagement()) |
| - chrome::SetLocalAuthCredentials(profile_, password_); |
| -#endif |
| + client_->GoogleSigninSucceeded(GetAuthenticatedUsername(), password_); |
| password_.clear(); // Don't need it anymore. |
| DisableOneClickSignIn(profile_); // Don't ever offer again. |