Index: components/password_manager/content/browser/content_password_manager_driver.cc |
diff --git a/components/password_manager/content/browser/content_password_manager_driver.cc b/components/password_manager/content/browser/content_password_manager_driver.cc |
index 0a7769436f04f191021aaed2f722c4d5e8247df4..9708a7f2dcf0cda61d450267bacd91642f9f53fd 100644 |
--- a/components/password_manager/content/browser/content_password_manager_driver.cc |
+++ b/components/password_manager/content/browser/content_password_manager_driver.cc |
@@ -4,6 +4,7 @@ |
#include "components/password_manager/content/browser/content_password_manager_driver.h" |
+#include "components/autofill/content/browser/content_autofill_driver.h" |
#include "components/autofill/content/common/autofill_messages.h" |
#include "components/autofill/core/common/form_data.h" |
#include "components/autofill/core/common/password_form.h" |
@@ -21,8 +22,10 @@ |
#include "content/public/browser/render_view_host.h" |
#include "content/public/browser/site_instance.h" |
#include "content/public/browser/web_contents.h" |
+#include "content/public/common/service_registry.h" |
#include "content/public/common/ssl_status.h" |
#include "ipc/ipc_message_macros.h" |
+#include "mojo/common/common_type_converters.h" |
#include "net/cert/cert_status_flags.h" |
namespace password_manager { |
@@ -92,31 +95,26 @@ void ContentPasswordManagerDriver::GeneratedPasswordAccepted( |
void ContentPasswordManagerDriver::FillSuggestion( |
const base::string16& username, |
const base::string16& password) { |
- content::RenderFrameHost* host = render_frame_host_; |
- host->Send(new AutofillMsg_FillPasswordSuggestion(host->GetRoutingID(), |
- username, password)); |
+ GetMojoAutofillAgent()->FillPasswordSuggestion(mojo::String::From(username), |
+ mojo::String::From(password)); |
} |
void ContentPasswordManagerDriver::PreviewSuggestion( |
const base::string16& username, |
const base::string16& password) { |
- content::RenderFrameHost* host = render_frame_host_; |
- host->Send(new AutofillMsg_PreviewPasswordSuggestion(host->GetRoutingID(), |
- username, password)); |
+ GetMojoAutofillAgent()->PreviewPasswordSuggestion( |
+ mojo::String::From(username), mojo::String::From(password)); |
} |
void ContentPasswordManagerDriver::ShowInitialPasswordAccountSuggestions( |
const autofill::PasswordFormFillData& form_data) { |
const int key = next_free_key_++; |
password_autofill_manager_.OnAddPasswordFormMapping(key, form_data); |
- render_frame_host_->Send( |
- new AutofillMsg_ShowInitialPasswordAccountSuggestions( |
- render_frame_host_->GetRoutingID(), key, form_data)); |
+ GetMojoAutofillAgent()->ShowInitialPasswordAccountSuggestions(key, form_data); |
} |
void ContentPasswordManagerDriver::ClearPreviewedForm() { |
- content::RenderFrameHost* host = render_frame_host_; |
- host->Send(new AutofillMsg_ClearPreviewedForm(host->GetRoutingID())); |
+ GetMojoAutofillAgent()->ClearPreviewedForm(); |
} |
void ContentPasswordManagerDriver::ForceSavePassword() { |
@@ -295,4 +293,13 @@ bool ContentPasswordManagerDriver::CheckChildProcessSecurityPolicy( |
return true; |
} |
+const autofill::mojom::AutofillAgentPtr& |
+ContentPasswordManagerDriver::GetMojoAutofillAgent() { |
+ autofill::ContentAutofillDriver* autofill_driver = |
+ autofill::ContentAutofillDriver::GetForRenderFrameHost( |
+ render_frame_host_); |
+ DCHECK(autofill_driver); |
+ return autofill_driver->GetMojoAutofillAgent(); |
+} |
+ |
} // namespace password_manager |