OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "components/signin/core/browser/signin_manager_base.h" | 5 #include "components/signin/core/browser/signin_manager_base.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 authenticated_username_ = username; | 87 authenticated_username_ = username; |
88 | 88 |
89 // TODO(rogerta): remove this DCHECK when migration work is started. | 89 // TODO(rogerta): remove this DCHECK when migration work is started. |
90 DCHECK_EQ(AccountTrackerService::MIGRATION_NOT_STARTED, | 90 DCHECK_EQ(AccountTrackerService::MIGRATION_NOT_STARTED, |
91 AccountTrackerService::GetMigrationState(client_->GetPrefs())); | 91 AccountTrackerService::GetMigrationState(client_->GetPrefs())); |
92 authenticated_account_id_ = | 92 authenticated_account_id_ = |
93 AccountTrackerService::PickAccountIdForAccount(client_->GetPrefs(), | 93 AccountTrackerService::PickAccountIdForAccount(client_->GetPrefs(), |
94 username, | 94 username, |
95 username); | 95 username); |
96 client_->GetPrefs()->SetString(prefs::kGoogleServicesUsername, username); | 96 client_->GetPrefs()->SetString(prefs::kGoogleServicesUsername, username); |
97 NotifyDiagnosticsObservers(USERNAME, username); | |
98 | 97 |
99 // Go ahead and update the last signed in username here as well. Once a | 98 // Go ahead and update the last signed in username here as well. Once a |
100 // user is signed in the two preferences should match. Doing it here as | 99 // user is signed in the two preferences should match. Doing it here as |
101 // opposed to on signin allows us to catch the upgrade scenario. | 100 // opposed to on signin allows us to catch the upgrade scenario. |
102 client_->GetPrefs()->SetString(prefs::kGoogleServicesLastUsername, username); | 101 client_->GetPrefs()->SetString(prefs::kGoogleServicesLastUsername, username); |
103 } | 102 } |
104 | 103 |
105 void SigninManagerBase::ClearAuthenticatedUsername() { | 104 void SigninManagerBase::ClearAuthenticatedUsername() { |
106 authenticated_username_.clear(); | 105 authenticated_username_.clear(); |
107 authenticated_account_id_.clear(); | 106 authenticated_account_id_.clear(); |
(...skipping 22 matching lines...) Expand all Loading... |
130 SigninDiagnosticsObserver* observer) { | 129 SigninDiagnosticsObserver* observer) { |
131 signin_diagnostics_observers_.AddObserver(observer); | 130 signin_diagnostics_observers_.AddObserver(observer); |
132 } | 131 } |
133 | 132 |
134 void SigninManagerBase::RemoveSigninDiagnosticsObserver( | 133 void SigninManagerBase::RemoveSigninDiagnosticsObserver( |
135 SigninDiagnosticsObserver* observer) { | 134 SigninDiagnosticsObserver* observer) { |
136 signin_diagnostics_observers_.RemoveObserver(observer); | 135 signin_diagnostics_observers_.RemoveObserver(observer); |
137 } | 136 } |
138 | 137 |
139 void SigninManagerBase::NotifyDiagnosticsObservers( | 138 void SigninManagerBase::NotifyDiagnosticsObservers( |
140 const UntimedSigninStatusField& field, | |
141 const std::string& value) { | |
142 FOR_EACH_OBSERVER(SigninDiagnosticsObserver, | |
143 signin_diagnostics_observers_, | |
144 NotifySigninValueChanged(field, value)); | |
145 } | |
146 | |
147 void SigninManagerBase::NotifyDiagnosticsObservers( | |
148 const TimedSigninStatusField& field, | 139 const TimedSigninStatusField& field, |
149 const std::string& value) { | 140 const std::string& value) { |
150 FOR_EACH_OBSERVER(SigninDiagnosticsObserver, | 141 FOR_EACH_OBSERVER(SigninDiagnosticsObserver, |
151 signin_diagnostics_observers_, | 142 signin_diagnostics_observers_, |
152 NotifySigninValueChanged(field, value)); | 143 NotifySigninValueChanged(field, value)); |
153 } | 144 } |
OLD | NEW |