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 28 matching lines...) Expand all Loading... |
39 ret.push_back(form_pair.second.get()); | 39 ret.push_back(form_pair.second.get()); |
40 return ret; | 40 return ret; |
41 } | 41 } |
42 | 42 |
43 ScopedVector<const autofill::PasswordForm> DeepCopyMapToVector( | 43 ScopedVector<const autofill::PasswordForm> DeepCopyMapToVector( |
44 const PasswordFormMap& password_form_map) { | 44 const PasswordFormMap& password_form_map) { |
45 ScopedVector<const autofill::PasswordForm> ret; | 45 ScopedVector<const autofill::PasswordForm> ret; |
46 ret.reserve(password_form_map.size()); | 46 ret.reserve(password_form_map.size()); |
47 for (const auto& form_pair : password_form_map) | 47 for (const auto& form_pair : password_form_map) |
48 ret.push_back(new autofill::PasswordForm(*form_pair.second)); | 48 ret.push_back(new autofill::PasswordForm(*form_pair.second)); |
49 return ret.Pass(); | 49 return ret; |
50 } | 50 } |
51 | 51 |
52 ScopedVector<const autofill::PasswordForm> ConstifyVector( | 52 ScopedVector<const autofill::PasswordForm> ConstifyVector( |
53 ScopedVector<autofill::PasswordForm>* forms) { | 53 ScopedVector<autofill::PasswordForm>* forms) { |
54 ScopedVector<const autofill::PasswordForm> ret; | 54 ScopedVector<const autofill::PasswordForm> ret; |
55 ret.assign(forms->begin(), forms->end()); | 55 ret.assign(forms->begin(), forms->end()); |
56 forms->weak_clear(); | 56 forms->weak_clear(); |
57 return ret.Pass(); | 57 return ret; |
58 } | 58 } |
59 | 59 |
60 // Updates one form in |forms| that has the same unique key as |updated_form|. | 60 // Updates one form in |forms| that has the same unique key as |updated_form|. |
61 // Returns true if the form was found and updated. | 61 // Returns true if the form was found and updated. |
62 bool UpdateFormInVector(const autofill::PasswordForm& updated_form, | 62 bool UpdateFormInVector(const autofill::PasswordForm& updated_form, |
63 ScopedVector<const autofill::PasswordForm>* forms) { | 63 ScopedVector<const autofill::PasswordForm>* forms) { |
64 ScopedVector<const autofill::PasswordForm>::iterator it = std::find_if( | 64 ScopedVector<const autofill::PasswordForm>::iterator it = std::find_if( |
65 forms->begin(), forms->end(), | 65 forms->begin(), forms->end(), |
66 [&updated_form](const autofill::PasswordForm* form) { | 66 [&updated_form](const autofill::PasswordForm* form) { |
67 return ArePasswordFormUniqueKeyEqual(*form, updated_form); | 67 return ArePasswordFormUniqueKeyEqual(*form, updated_form); |
(...skipping 24 matching lines...) Expand all Loading... |
92 ManagePasswordsState::ManagePasswordsState() | 92 ManagePasswordsState::ManagePasswordsState() |
93 : state_(password_manager::ui::INACTIVE_STATE), | 93 : state_(password_manager::ui::INACTIVE_STATE), |
94 client_(nullptr) { | 94 client_(nullptr) { |
95 } | 95 } |
96 | 96 |
97 ManagePasswordsState::~ManagePasswordsState() {} | 97 ManagePasswordsState::~ManagePasswordsState() {} |
98 | 98 |
99 void ManagePasswordsState::OnPendingPassword( | 99 void ManagePasswordsState::OnPendingPassword( |
100 scoped_ptr<password_manager::PasswordFormManager> form_manager) { | 100 scoped_ptr<password_manager::PasswordFormManager> form_manager) { |
101 ClearData(); | 101 ClearData(); |
102 form_manager_ = form_manager.Pass(); | 102 form_manager_ = std::move(form_manager); |
103 current_forms_weak_ = ScopedPtrMapToVector(form_manager_->best_matches()); | 103 current_forms_weak_ = ScopedPtrMapToVector(form_manager_->best_matches()); |
104 origin_ = form_manager_->pending_credentials().origin; | 104 origin_ = form_manager_->pending_credentials().origin; |
105 SetState(password_manager::ui::PENDING_PASSWORD_STATE); | 105 SetState(password_manager::ui::PENDING_PASSWORD_STATE); |
106 } | 106 } |
107 | 107 |
108 void ManagePasswordsState::OnUpdatePassword( | 108 void ManagePasswordsState::OnUpdatePassword( |
109 scoped_ptr<password_manager::PasswordFormManager> form_manager) { | 109 scoped_ptr<password_manager::PasswordFormManager> form_manager) { |
110 ClearData(); | 110 ClearData(); |
111 form_manager_ = form_manager.Pass(); | 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 origin_ = form_manager_->pending_credentials().origin; | 113 origin_ = form_manager_->pending_credentials().origin; |
114 SetState(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE); | 114 SetState(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE); |
115 } | 115 } |
116 | 116 |
117 void ManagePasswordsState::OnRequestCredentials( | 117 void ManagePasswordsState::OnRequestCredentials( |
118 ScopedVector<autofill::PasswordForm> local_credentials, | 118 ScopedVector<autofill::PasswordForm> local_credentials, |
119 ScopedVector<autofill::PasswordForm> federated_credentials, | 119 ScopedVector<autofill::PasswordForm> federated_credentials, |
120 const GURL& origin) { | 120 const GURL& origin) { |
121 ClearData(); | 121 ClearData(); |
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
300 DCHECK(client_); | 300 DCHECK(client_); |
301 if (client_->GetLogManager()->IsLoggingActive()) { | 301 if (client_->GetLogManager()->IsLoggingActive()) { |
302 password_manager::BrowserSavePasswordProgressLogger logger( | 302 password_manager::BrowserSavePasswordProgressLogger logger( |
303 client_->GetLogManager()); | 303 client_->GetLogManager()); |
304 logger.LogNumber( | 304 logger.LogNumber( |
305 autofill::SavePasswordProgressLogger::STRING_NEW_UI_STATE, | 305 autofill::SavePasswordProgressLogger::STRING_NEW_UI_STATE, |
306 state); | 306 state); |
307 } | 307 } |
308 state_ = state; | 308 state_ = state; |
309 } | 309 } |
OLD | NEW |