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 "components/password_manager/core/browser/browser_save_password_progres
s_logger.h" | 7 #include "components/password_manager/core/browser/browser_save_password_progres
s_logger.h" |
8 #include "components/password_manager/core/browser/password_form_manager.h" | 8 #include "components/password_manager/core/browser/password_form_manager.h" |
9 #include "components/password_manager/core/browser/password_manager_client.h" | 9 #include "components/password_manager/core/browser/password_manager_client.h" |
10 #include "components/password_manager/core/common/credential_manager_types.h" | 10 #include "components/password_manager/core/common/credential_manager_types.h" |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 form_manager_->best_matches().end()); | 142 form_manager_->best_matches().end()); |
143 current_forms[form_manager_->associated_username()] = | 143 current_forms[form_manager_->associated_username()] = |
144 &form_manager_->pending_credentials(); | 144 &form_manager_->pending_credentials(); |
145 current_forms_weak_ = MapToVector(current_forms); | 145 current_forms_weak_ = MapToVector(current_forms); |
146 origin_ = form_manager_->pending_credentials().origin; | 146 origin_ = form_manager_->pending_credentials().origin; |
147 SetState(password_manager::ui::CONFIRMATION_STATE); | 147 SetState(password_manager::ui::CONFIRMATION_STATE); |
148 } | 148 } |
149 | 149 |
150 void ManagePasswordsState::OnPasswordAutofilled( | 150 void ManagePasswordsState::OnPasswordAutofilled( |
151 const PasswordFormMap& password_form_map) { | 151 const PasswordFormMap& password_form_map) { |
152 // TODO(vabr): Revert back to DCHECK once http://crbug.com/486931 is fixed. | 152 DCHECK(!password_form_map.empty()); |
153 CHECK(!password_form_map.empty()); | |
154 ClearData(); | 153 ClearData(); |
155 if (password_form_map.begin()->second->IsPublicSuffixMatch()) { | 154 if (password_form_map.begin()->second->IsPublicSuffixMatch()) { |
156 // Don't show the UI for PSL matched passwords. They are not stored for this | 155 // Don't show the UI for PSL matched passwords. They are not stored for this |
157 // page and cannot be deleted. | 156 // page and cannot be deleted. |
158 origin_ = GURL(); | 157 origin_ = GURL(); |
159 SetState(password_manager::ui::INACTIVE_STATE); | 158 SetState(password_manager::ui::INACTIVE_STATE); |
160 } else { | 159 } else { |
161 local_credentials_forms_ = DeepCopyMapToVector(password_form_map); | 160 local_credentials_forms_ = DeepCopyMapToVector(password_form_map); |
162 origin_ = local_credentials_forms_.front()->origin; | 161 origin_ = local_credentials_forms_.front()->origin; |
163 SetState(password_manager::ui::MANAGE_STATE); | 162 SetState(password_manager::ui::MANAGE_STATE); |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
276 void ManagePasswordsState::SetState(password_manager::ui::State state) { | 275 void ManagePasswordsState::SetState(password_manager::ui::State state) { |
277 DCHECK(client_); | 276 DCHECK(client_); |
278 if (client_->IsLoggingActive()) { | 277 if (client_->IsLoggingActive()) { |
279 password_manager::BrowserSavePasswordProgressLogger logger(client_); | 278 password_manager::BrowserSavePasswordProgressLogger logger(client_); |
280 logger.LogNumber( | 279 logger.LogNumber( |
281 autofill::SavePasswordProgressLogger::STRING_NEW_UI_STATE, | 280 autofill::SavePasswordProgressLogger::STRING_NEW_UI_STATE, |
282 state); | 281 state); |
283 } | 282 } |
284 state_ = state; | 283 state_ = state; |
285 } | 284 } |
OLD | NEW |