| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "chrome/browser/ui/passwords/manage_passwords_state.h" | 5 #include "chrome/browser/ui/passwords/manage_passwords_state.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "components/password_manager/core/browser/browser_save_password_progres
s_logger.h" | 9 #include "components/password_manager/core/browser/browser_save_password_progres
s_logger.h" |
| 10 #include "components/password_manager/core/browser/log_manager.h" | 10 #include "components/password_manager/core/browser/log_manager.h" |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 | 105 |
| 106 ManagePasswordsState::~ManagePasswordsState() {} | 106 ManagePasswordsState::~ManagePasswordsState() {} |
| 107 | 107 |
| 108 void ManagePasswordsState::OnPendingPassword( | 108 void ManagePasswordsState::OnPendingPassword( |
| 109 scoped_ptr<password_manager::PasswordFormManager> form_manager) { | 109 scoped_ptr<password_manager::PasswordFormManager> form_manager) { |
| 110 ClearData(); | 110 ClearData(); |
| 111 form_manager_ = std::move(form_manager); | 111 form_manager_ = std::move(form_manager); |
| 112 current_forms_weak_ = ScopedPtrMapToVector(form_manager_->best_matches()); | 112 current_forms_weak_ = ScopedPtrMapToVector(form_manager_->best_matches()); |
| 113 AddRawPtrFromOwningVector(form_manager_->federated_matches(), | 113 AddRawPtrFromOwningVector(form_manager_->federated_matches(), |
| 114 ¤t_forms_weak_); | 114 ¤t_forms_weak_); |
| 115 origin_ = form_manager_->pending_credentials().origin; | 115 origin_ = form_manager_->observed_form().origin; |
| 116 SetState(password_manager::ui::PENDING_PASSWORD_STATE); | 116 SetState(password_manager::ui::PENDING_PASSWORD_STATE); |
| 117 } | 117 } |
| 118 | 118 |
| 119 void ManagePasswordsState::OnUpdatePassword( | 119 void ManagePasswordsState::OnUpdatePassword( |
| 120 scoped_ptr<password_manager::PasswordFormManager> form_manager) { | 120 scoped_ptr<password_manager::PasswordFormManager> form_manager) { |
| 121 ClearData(); | 121 ClearData(); |
| 122 form_manager_ = std::move(form_manager); | 122 form_manager_ = std::move(form_manager); |
| 123 current_forms_weak_ = ScopedPtrMapToVector(form_manager_->best_matches()); | 123 current_forms_weak_ = ScopedPtrMapToVector(form_manager_->best_matches()); |
| 124 AddRawPtrFromOwningVector(form_manager_->federated_matches(), | 124 AddRawPtrFromOwningVector(form_manager_->federated_matches(), |
| 125 ¤t_forms_weak_); | 125 ¤t_forms_weak_); |
| 126 origin_ = form_manager_->pending_credentials().origin; | 126 origin_ = form_manager_->observed_form().origin; |
| 127 SetState(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE); | 127 SetState(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE); |
| 128 } | 128 } |
| 129 | 129 |
| 130 void ManagePasswordsState::OnRequestCredentials( | 130 void ManagePasswordsState::OnRequestCredentials( |
| 131 ScopedVector<autofill::PasswordForm> local_credentials, | 131 ScopedVector<autofill::PasswordForm> local_credentials, |
| 132 ScopedVector<autofill::PasswordForm> federated_credentials, | 132 ScopedVector<autofill::PasswordForm> federated_credentials, |
| 133 const GURL& origin) { | 133 const GURL& origin) { |
| 134 ClearData(); | 134 ClearData(); |
| 135 local_credentials_forms_ = ConstifyVector(&local_credentials); | 135 local_credentials_forms_ = ConstifyVector(&local_credentials); |
| 136 federated_credentials_forms_ = ConstifyVector(&federated_credentials); | 136 federated_credentials_forms_ = ConstifyVector(&federated_credentials); |
| 137 origin_ = origin; | 137 origin_ = origin; |
| 138 SetState(password_manager::ui::CREDENTIAL_REQUEST_STATE); | 138 SetState(password_manager::ui::CREDENTIAL_REQUEST_STATE); |
| 139 } | 139 } |
| 140 | 140 |
| 141 void ManagePasswordsState::OnAutoSignin( | 141 void ManagePasswordsState::OnAutoSignin( |
| 142 ScopedVector<autofill::PasswordForm> local_forms) { | 142 ScopedVector<autofill::PasswordForm> local_forms, const GURL& origin) { |
| 143 DCHECK(!local_forms.empty()); | 143 DCHECK(!local_forms.empty()); |
| 144 ClearData(); | 144 ClearData(); |
| 145 local_credentials_forms_ = ConstifyVector(&local_forms); | 145 local_credentials_forms_ = ConstifyVector(&local_forms); |
| 146 origin_ = local_credentials_forms_[0]->origin; | 146 origin_ = origin; |
| 147 SetState(password_manager::ui::AUTO_SIGNIN_STATE); | 147 SetState(password_manager::ui::AUTO_SIGNIN_STATE); |
| 148 } | 148 } |
| 149 | 149 |
| 150 void ManagePasswordsState::OnAutomaticPasswordSave( | 150 void ManagePasswordsState::OnAutomaticPasswordSave( |
| 151 scoped_ptr<PasswordFormManager> form_manager) { | 151 scoped_ptr<PasswordFormManager> form_manager) { |
| 152 ClearData(); | 152 ClearData(); |
| 153 form_manager_ = std::move(form_manager); | 153 form_manager_ = std::move(form_manager); |
| 154 autofill::ConstPasswordFormMap current_forms; | 154 autofill::ConstPasswordFormMap current_forms; |
| 155 for (const auto& match : form_manager_->best_matches()) { | 155 for (const auto& match : form_manager_->best_matches()) { |
| 156 current_forms.insert(std::make_pair(match.first, match.second.get())); | 156 current_forms.insert(std::make_pair(match.first, match.second.get())); |
| 157 } | 157 } |
| 158 current_forms[form_manager_->pending_credentials().username_value] = | 158 current_forms[form_manager_->pending_credentials().username_value] = |
| 159 &form_manager_->pending_credentials(); | 159 &form_manager_->pending_credentials(); |
| 160 current_forms_weak_ = MapToVector(current_forms); | 160 current_forms_weak_ = MapToVector(current_forms); |
| 161 AddRawPtrFromOwningVector(form_manager_->federated_matches(), | 161 AddRawPtrFromOwningVector(form_manager_->federated_matches(), |
| 162 ¤t_forms_weak_); | 162 ¤t_forms_weak_); |
| 163 origin_ = form_manager_->pending_credentials().origin; | 163 origin_ = form_manager_->observed_form().origin; |
| 164 SetState(password_manager::ui::CONFIRMATION_STATE); | 164 SetState(password_manager::ui::CONFIRMATION_STATE); |
| 165 } | 165 } |
| 166 | 166 |
| 167 void ManagePasswordsState::OnPasswordAutofilled( | 167 void ManagePasswordsState::OnPasswordAutofilled( |
| 168 const PasswordFormMap& password_form_map, | 168 const PasswordFormMap& password_form_map, |
| 169 const GURL& origin, | 169 const GURL& origin, |
| 170 const std::vector<scoped_ptr<autofill::PasswordForm>>* federated_matches) { | 170 const std::vector<scoped_ptr<autofill::PasswordForm>>* federated_matches) { |
| 171 DCHECK(!password_form_map.empty()); | 171 DCHECK(!password_form_map.empty()); |
| 172 ClearData(); | 172 ClearData(); |
| 173 bool only_PSL_matches = | 173 bool only_PSL_matches = |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 329 DCHECK(client_); | 329 DCHECK(client_); |
| 330 if (client_->GetLogManager()->IsLoggingActive()) { | 330 if (client_->GetLogManager()->IsLoggingActive()) { |
| 331 password_manager::BrowserSavePasswordProgressLogger logger( | 331 password_manager::BrowserSavePasswordProgressLogger logger( |
| 332 client_->GetLogManager()); | 332 client_->GetLogManager()); |
| 333 logger.LogNumber( | 333 logger.LogNumber( |
| 334 autofill::SavePasswordProgressLogger::STRING_NEW_UI_STATE, | 334 autofill::SavePasswordProgressLogger::STRING_NEW_UI_STATE, |
| 335 state); | 335 state); |
| 336 } | 336 } |
| 337 state_ = state; | 337 state_ = state; |
| 338 } | 338 } |
| OLD | NEW |