| Index: chrome/browser/password_manager/chrome_password_manager_client.cc
|
| diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc
|
| index 51ee6be440a6c22fb43e60429809ce22c04393d3..8daf0a47e9a127cfae8ae07e6490ad5c705531d0 100644
|
| --- a/chrome/browser/password_manager/chrome_password_manager_client.cc
|
| +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
|
| @@ -91,20 +91,16 @@ void ChromePasswordManagerClient::PasswordWasAutofilled(
|
| void ChromePasswordManagerClient::AuthenticateAutofillAndFillForm(
|
| scoped_ptr<autofill::PasswordFormFillData> fill_data) {
|
| #if defined(OS_ANDROID)
|
| - if (PasswordAuthenticationManager
|
| - ::IsAutofillPasswordAuthenticationEnabled()) {
|
| - PasswordAuthenticationManager::AuthenticatePasswordAutofill(
|
| - web_contents_,
|
| - base::Bind(&ChromePasswordManagerClient::CommitFillPasswordForm,
|
| - weak_factory_.GetWeakPtr(),
|
| - base::Owned(fill_data.release())));
|
| - return;
|
| - }
|
| -#endif // OS_ANDROID
|
| -
|
| + PasswordAuthenticationManager::AuthenticatePasswordAutofill(
|
| + web_contents_,
|
| + base::Bind(&ChromePasswordManagerClient::CommitFillPasswordForm,
|
| + weak_factory_.GetWeakPtr(),
|
| + base::Owned(fill_data.release())));
|
| +#else
|
| // Additional authentication is currently only available for Android, so all
|
| // other plaftorms should just fill the password form directly.
|
| CommitFillPasswordForm(fill_data.get());
|
| +#endif // OS_ANDROID
|
| }
|
|
|
| Profile* ChromePasswordManagerClient::GetProfile() {
|
|
|