Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1054)

Unified Diff: components/autofill/content/renderer/password_generation_agent.cc

Issue 2650623002: Use explicit WebString conversions in autofill (Closed)
Patch Set: . Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/autofill/content/renderer/password_generation_agent.cc
diff --git a/components/autofill/content/renderer/password_generation_agent.cc b/components/autofill/content/renderer/password_generation_agent.cc
index 183b5f068c265025bbe584a03fd1611b7d3fa9a6..ebca6d4b1cb11bf0f473d9451abb790f7180d02f 100644
--- a/components/autofill/content/renderer/password_generation_agent.cc
+++ b/components/autofill/content/renderer/password_generation_agent.cc
@@ -80,7 +80,7 @@ std::vector<blink::WebInputElement> FindPasswordElementsForGeneration(
all_password_elements.begin(), all_password_elements.end(),
[&field_signature](const blink::WebInputElement& input) {
FieldSignature signature = CalculateFieldSignatureByNameAndType(
- input.nameForAutofill(), input.formControlType().utf8());
+ input.nameForAutofill().utf16(), input.formControlType().utf8());
return signature == field_signature;
});
std::vector<blink::WebInputElement> passwords;
@@ -305,7 +305,8 @@ void PasswordGenerationAgent::GeneratedPasswordAccepted(
password_generation::LogPasswordGenerationEvent(
password_generation::PASSWORD_ACCEPTED);
for (auto& password_element : generation_form_data_->password_elements) {
- password_element.setValue(password, true /* sendEvents */);
+ password_element.setValue(blink::WebString::fromUTF16(password),
+ true /* sendEvents */);
// setValue() above may have resulted in JavaScript closing the frame.
if (!render_frame())
return;
@@ -343,7 +344,7 @@ PasswordGenerationAgent::CreatePasswordFormToPresave() {
// TODO(kolos): when we are good in username detection, save username
// as well.
password_form->username_value = base::string16();
- password_form->password_value = generation_element_.value();
+ password_form->password_value = generation_element_.value().utf16();
}
return password_form;
@@ -515,8 +516,9 @@ void PasswordGenerationAgent::ShowGenerationPopup() {
GetPasswordManagerClient()->ShowPasswordGenerationPopup(
render_frame()->GetRenderView()->ElementBoundsInWindow(
generation_element_),
- generation_element_.maxLength(), generation_element_.nameForAutofill(),
- is_manually_triggered_, *generation_form_data_->form);
+ generation_element_.maxLength(),
+ generation_element_.nameForAutofill().utf16(), is_manually_triggered_,
+ *generation_form_data_->form);
generation_popup_shown_ = true;
}
@@ -564,7 +566,7 @@ void PasswordGenerationAgent::UserTriggeredGeneratePassword() {
password_elements = FindPasswordElementsForGeneration(
password_elements,
CalculateFieldSignatureByNameAndType(
- last_focused_password_element_.nameForAutofill(),
+ last_focused_password_element_.nameForAutofill().utf16(),
last_focused_password_element_.formControlType().utf8()));
generation_form_data_.reset(new AccountCreationFormData(
make_linked_ptr(password_form.release()), password_elements));

Powered by Google App Engine
This is Rietveld 408576698