mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: mojofy autofill (#18723)

Browse source
This commit is contained in:
Jeremy Apthorp 2019-06-12 15:08:22 -07:00 • committed by GitHub
parent ec10fd3044
commit ba96cdb7dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 76 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

44
atom/renderer/atom_autofill_agent.cc
View file

@ -4,11 +4,12 @@
#include "atom/renderer/atom_autofill_agent.h"
#include <utility>
#include <vector>
#include "atom/common/api/api_messages.h"
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_view.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/blink/public/platform/web_keyboard_event.h"
#include "third_party/blink/public/platform/web_string.h"
#include "third_party/blink/public/web/web_document.h"
@ -49,13 +50,23 @@ void TrimStringVectorForIPC(std::vector<base::string16>* strings) {
}
} // namespace
AutofillAgent::AutofillAgent(content::RenderFrame* frame)
: content::RenderFrameObserver(frame), weak_ptr_factory_(this) {
AutofillAgent::AutofillAgent(content::RenderFrame* frame,
blink::AssociatedInterfaceRegistry* registry)
: content::RenderFrameObserver(frame),
binding_(this),
weak_ptr_factory_(this) {
render_frame()->GetWebFrame()->SetAutofillClient(this);
registry->AddInterface(
base::Bind(&AutofillAgent::BindRequest, base::Unretained(this)));
}
AutofillAgent::~AutofillAgent() = default;
void AutofillAgent::BindRequest(
mojom::ElectronAutofillAgentAssociatedRequest request) {
binding_.Bind(std::move(request));
}
void AutofillAgent::OnDestruct() {
delete this;
}
@ -165,24 +176,13 @@ void AutofillAgent::DidCompleteFocusChangeInFrame() {
DoFocusChangeComplete();
}
bool AutofillAgent::OnMessageReceived(const IPC::Message& message) {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(AutofillAgent, message)
IPC_MESSAGE_HANDLER(AtomAutofillFrameMsg_AcceptSuggestion,
OnAcceptSuggestion)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
return handled;
}
bool AutofillAgent::IsUserGesture() const {
return blink::WebUserGestureIndicator::IsProcessingUserGesture(
render_frame()->GetWebFrame());
}
void AutofillAgent::HidePopup() {
Send(new AtomAutofillFrameHostMsg_HidePopup(render_frame()->GetRoutingID()));
GetElectronBrowser()->HideAutofillPopup();
}
void AutofillAgent::ShowPopup(const blink::WebFormControlElement& element,
@ -190,11 +190,10 @@ void AutofillAgent::ShowPopup(const blink::WebFormControlElement& element,
const std::vector<base::string16>& labels) {
gfx::RectF bounds =
render_frame()->GetRenderView()->ElementBoundsInWindow(element);
Send(new AtomAutofillFrameHostMsg_ShowPopup(render_frame()->GetRoutingID(),
bounds, values, labels));
GetElectronBrowser()->ShowAutofillPopup(bounds, values, labels);
}
void AutofillAgent::OnAcceptSuggestion(base::string16 suggestion) {
void AutofillAgent::AcceptDataListSuggestion(const base::string16& suggestion) {
auto element = render_frame()->GetWebFrame()->GetDocument().FocusedElement();
if (element.IsFormControlElement()) {
ToWebInputElement(&element)->SetAutofillValue(
@ -219,4 +218,13 @@ void AutofillAgent::DoFocusChangeComplete() {
focused_node_was_last_clicked_ = false;
}
const mojom::ElectronBrowserPtr& AutofillAgent::GetElectronBrowser() {
if (!browser_ptr_) {
render_frame()->GetRemoteInterfaces()->GetInterface(
mojo::MakeRequest(&browser_ptr_));
}
return browser_ptr_;
}
} // namespace atom