Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/autofill/content/renderer/password_autofill_agent.h" | 5 #include "components/autofill/content/renderer/password_autofill_agent.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| 11 #include "base/metrics/field_trial.h" | 11 #include "base/metrics/field_trial.h" |
| 12 #include "base/metrics/histogram_macros.h" | 12 #include "base/metrics/histogram_macros.h" |
| 13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 14 #include "components/autofill/content/common/autofill_messages.h" | 14 #include "components/autofill/content/common/autofill_messages.h" |
| 15 #include "components/autofill/content/renderer/form_autofill_util.h" | 15 #include "components/autofill/content/renderer/form_autofill_util.h" |
| 16 #include "components/autofill/content/renderer/password_form_conversion_utils.h" | 16 #include "components/autofill/content/renderer/password_form_conversion_utils.h" |
| 17 #include "components/autofill/content/renderer/renderer_save_password_progress_l ogger.h" | 17 #include "components/autofill/content/renderer/renderer_save_password_progress_l ogger.h" |
| 18 #include "components/autofill/core/common/autofill_constants.h" | 18 #include "components/autofill/core/common/autofill_constants.h" |
| 19 #include "components/autofill/core/common/autofill_switches.h" | 19 #include "components/autofill/core/common/autofill_switches.h" |
| 20 #include "components/autofill/core/common/autofill_util.h" | |
| 20 #include "components/autofill/core/common/form_field_data.h" | 21 #include "components/autofill/core/common/form_field_data.h" |
| 21 #include "components/autofill/core/common/password_form.h" | 22 #include "components/autofill/core/common/password_form.h" |
| 22 #include "components/autofill/core/common/password_form_fill_data.h" | 23 #include "components/autofill/core/common/password_form_fill_data.h" |
| 23 #include "content/public/renderer/document_state.h" | 24 #include "content/public/renderer/document_state.h" |
| 24 #include "content/public/renderer/navigation_state.h" | 25 #include "content/public/renderer/navigation_state.h" |
| 25 #include "content/public/renderer/render_frame.h" | 26 #include "content/public/renderer/render_frame.h" |
| 26 #include "content/public/renderer/render_view.h" | 27 #include "content/public/renderer/render_view.h" |
| 27 #include "third_party/WebKit/public/platform/WebVector.h" | 28 #include "third_party/WebKit/public/platform/WebVector.h" |
| 28 #include "third_party/WebKit/public/web/WebAutofillClient.h" | 29 #include "third_party/WebKit/public/web/WebAutofillClient.h" |
| 29 #include "third_party/WebKit/public/web/WebDocument.h" | 30 #include "third_party/WebKit/public/web/WebDocument.h" |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 218 | 219 |
| 219 bool IsElementEditable(const blink::WebInputElement& element) { | 220 bool IsElementEditable(const blink::WebInputElement& element) { |
| 220 return element.isEnabled() && !element.isReadOnly(); | 221 return element.isEnabled() && !element.isReadOnly(); |
| 221 } | 222 } |
| 222 | 223 |
| 223 bool DoUsernamesMatch(const base::string16& username1, | 224 bool DoUsernamesMatch(const base::string16& username1, |
| 224 const base::string16& username2, | 225 const base::string16& username2, |
| 225 bool exact_match) { | 226 bool exact_match) { |
| 226 if (exact_match) | 227 if (exact_match) |
| 227 return username1 == username2; | 228 return username1 == username2; |
| 228 return base::StartsWith(username1, username2, true); | 229 return base::StartsWith(username1, username2, true) || |
| 230 ContainsTokenThatStartsWith(username1, username2, true); | |
| 229 } | 231 } |
| 230 | 232 |
| 231 // Returns |true| if the given element is editable. Otherwise, returns |false|. | 233 // Returns |true| if the given element is editable. Otherwise, returns |false|. |
| 232 bool IsElementAutocompletable(const blink::WebInputElement& element) { | 234 bool IsElementAutocompletable(const blink::WebInputElement& element) { |
| 233 return IsElementEditable(element); | 235 return IsElementEditable(element); |
| 234 } | 236 } |
| 235 | 237 |
| 236 // Returns true if the password specified in |form| is a default value. | 238 // Returns true if the password specified in |form| is a default value. |
| 237 bool PasswordValueIsDefault(const base::string16& password_element, | 239 bool PasswordValueIsDefault(const base::string16& password_element, |
| 238 const base::string16& password_value, | 240 const base::string16& password_value, |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 406 | 408 |
| 407 // TODO(tkent): Check maxlength and pattern for both username and password | 409 // TODO(tkent): Check maxlength and pattern for both username and password |
| 408 // fields. | 410 // fields. |
| 409 | 411 |
| 410 // Input matches the username, fill in required values. | 412 // Input matches the username, fill in required values. |
| 411 if (!username_element->isNull() && | 413 if (!username_element->isNull() && |
| 412 IsElementAutocompletable(*username_element)) { | 414 IsElementAutocompletable(*username_element)) { |
| 413 username_element->setValue(username, true); | 415 username_element->setValue(username, true); |
| 414 nonscript_modified_values[*username_element] = username; | 416 nonscript_modified_values[*username_element] = username; |
| 415 username_element->setAutofilled(true); | 417 username_element->setAutofilled(true); |
| 416 | 418 if (set_selection) |
| 417 if (set_selection) { | 419 PreviewSuggestion(username_element, username, current_username); |
| 418 username_element->setSelectionRange(current_username.length(), | |
| 419 username.length()); | |
| 420 } | |
| 421 } else if (current_username != username) { | 420 } else if (current_username != username) { |
| 422 // If the username can't be filled and it doesn't match a saved password | 421 // If the username can't be filled and it doesn't match a saved password |
| 423 // as is, don't autofill a password. | 422 // as is, don't autofill a password. |
| 424 return other_possible_username_selected; | 423 return other_possible_username_selected; |
| 425 } | 424 } |
| 426 | 425 |
| 427 // Wait to fill in the password until a user gesture occurs. This is to make | 426 // Wait to fill in the password until a user gesture occurs. This is to make |
| 428 // sure that we do not fill in the DOM with a password until we believe the | 427 // sure that we do not fill in the DOM with a password until we believe the |
| 429 // user is intentionally interacting with the page. | 428 // user is intentionally interacting with the page. |
| 430 password_element->setSuggestedValue(password); | 429 password_element->setSuggestedValue(password); |
| (...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 788 if (!FindLoginInfo(node, &username_element, &password_info) || | 787 if (!FindLoginInfo(node, &username_element, &password_info) || |
| 789 !IsElementAutocompletable(username_element) || | 788 !IsElementAutocompletable(username_element) || |
| 790 !IsElementAutocompletable(password_info->password_field)) { | 789 !IsElementAutocompletable(password_info->password_field)) { |
| 791 return false; | 790 return false; |
| 792 } | 791 } |
| 793 | 792 |
| 794 was_username_autofilled_ = username_element.isAutofilled(); | 793 was_username_autofilled_ = username_element.isAutofilled(); |
| 795 username_selection_start_ = username_element.selectionStart(); | 794 username_selection_start_ = username_element.selectionStart(); |
| 796 username_element.setSuggestedValue(username); | 795 username_element.setSuggestedValue(username); |
| 797 username_element.setAutofilled(true); | 796 username_element.setAutofilled(true); |
| 798 username_element.setSelectionRange( | 797 ::autofill::PreviewSuggestion(&username_element, username, |
|
please use gerrit instead
2015/06/30 19:06:23
You should pass in username_element.suggestedValue
Pritam Nikam
2015/07/01 17:26:00
Done.
| |
| 799 username_selection_start_, | 798 username_element.value()); |
| 800 username_element.suggestedValue().length()); | |
| 801 | |
| 802 was_password_autofilled_ = password_info->password_field.isAutofilled(); | 799 was_password_autofilled_ = password_info->password_field.isAutofilled(); |
| 803 password_info->password_field.setSuggestedValue(password); | 800 password_info->password_field.setSuggestedValue(password); |
| 804 password_info->password_field.setAutofilled(true); | 801 password_info->password_field.setAutofilled(true); |
| 805 | 802 |
| 806 return true; | 803 return true; |
| 807 } | 804 } |
| 808 | 805 |
| 809 bool PasswordAutofillAgent::DidClearAutofillSelection( | 806 bool PasswordAutofillAgent::DidClearAutofillSelection( |
| 810 const blink::WebNode& node) { | 807 const blink::WebNode& node) { |
| 811 blink::WebInputElement username_element; | 808 blink::WebInputElement username_element; |
| (...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1490 void PasswordAutofillAgent::LegacyPasswordAutofillAgent::DidStopLoading() { | 1487 void PasswordAutofillAgent::LegacyPasswordAutofillAgent::DidStopLoading() { |
| 1491 agent_->DidStopLoading(); | 1488 agent_->DidStopLoading(); |
| 1492 } | 1489 } |
| 1493 | 1490 |
| 1494 void PasswordAutofillAgent::LegacyPasswordAutofillAgent:: | 1491 void PasswordAutofillAgent::LegacyPasswordAutofillAgent:: |
| 1495 DidStartProvisionalLoad(blink::WebLocalFrame* navigated_frame) { | 1492 DidStartProvisionalLoad(blink::WebLocalFrame* navigated_frame) { |
| 1496 agent_->LegacyDidStartProvisionalLoad(navigated_frame); | 1493 agent_->LegacyDidStartProvisionalLoad(navigated_frame); |
| 1497 } | 1494 } |
| 1498 | 1495 |
| 1499 } // namespace autofill | 1496 } // namespace autofill |
| OLD | NEW |