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

move popup related code to nativewindow

Browse source
This commit is contained in:
Heilig Benedek 2017-05-26 03:38:27 +02:00
parent 039908a244
commit 192cd7787b
11 changed files with 95 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

29
atom/renderer/atom_autofill_agent.cc
View file

@ -52,16 +52,11 @@ void TrimStringVectorForIPC(std::vector<base::string16>* strings) {
AutofillAgent::AutofillAgent(
content::RenderFrame* frame)
: content::RenderFrameObserver(frame),
render_frame_(frame),
helper_(new Helper(this)),
focused_node_was_last_clicked_(false),
was_focused_before_now_(false),
weak_ptr_factory_(this) {
render_frame_->GetWebFrame()->setAutofillClient(this);
}
AutofillAgent::~AutofillAgent() {
delete helper_;
render_frame()->GetWebFrame()->setAutofillClient(this);
}
void AutofillAgent::OnDestruct() {
@ -169,7 +164,7 @@ void AutofillAgent::ShowSuggestions(
}
AutofillAgent::Helper::Helper(AutofillAgent* agent)
: content::RenderViewObserver(agent->render_frame_->GetRenderView()),
: content::RenderViewObserver(agent->render_frame()->GetRenderView()),
agent_(agent) {
}
@ -184,9 +179,7 @@ void AutofillAgent::Helper::FocusChangeComplete() {
bool AutofillAgent::OnMessageReceived(const IPC::Message& message) {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(AutofillAgent, message)
IPC_MESSAGE_HANDLER(AtomAutofillViewHostMsg_RoutingId,
OnWebContentsRoutingIdReceived)
IPC_MESSAGE_HANDLER(AtomAutofillViewMsg_AcceptSuggestion,
IPC_MESSAGE_HANDLER(AtomAutofillFrameMsg_AcceptSuggestion,
OnAcceptSuggestion)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
@ -194,16 +187,12 @@ bool AutofillAgent::OnMessageReceived(const IPC::Message& message) {
return handled;
}
void AutofillAgent::OnWebContentsRoutingIdReceived(int id) {
web_contents_routing_id_ = id;
}
bool AutofillAgent::IsUserGesture() const {
return blink::WebUserGestureIndicator::isProcessingUserGesture();
}
void AutofillAgent::HidePopup() {
Send(new AtomAutofillViewMsg_HidePopup(web_contents_routing_id_));
Send(new AtomAutofillFrameHostMsg_HidePopup(render_frame()->GetRoutingID()));
}
void AutofillAgent::ShowPopup(
@ -211,13 +200,13 @@ void AutofillAgent::ShowPopup(
const std::vector<base::string16>& values,
const std::vector<base::string16>& labels) {
gfx::RectF bounds =
render_frame_->GetRenderView()->ElementBoundsInWindow(element);
Send(new AtomAutofillViewMsg_ShowPopup(
web_contents_routing_id_, routing_id(), bounds, values, labels));
render_frame()->GetRenderView()->ElementBoundsInWindow(element);
Send(new AtomAutofillFrameHostMsg_ShowPopup(
render_frame()->GetRoutingID(), bounds, values, labels));
}
void AutofillAgent::OnAcceptSuggestion(base::string16 suggestion) {
auto element = render_frame_->GetWebFrame()->document().focusedElement();
auto element = render_frame()->GetWebFrame()->document().focusedElement();
if (element.isFormControlElement()) {
toWebInputElement(&element)->setSuggestedValue(
blink::WebString::fromUTF16(suggestion));
@ -225,7 +214,7 @@ void AutofillAgent::OnAcceptSuggestion(base::string16 suggestion) {
}
void AutofillAgent::DoFocusChangeComplete() {
auto element = render_frame_->GetWebFrame()->document().focusedElement();
auto element = render_frame()->GetWebFrame()->document().focusedElement();
if (element.isNull() || !element.isFormControlElement())
return;

9
atom/renderer/atom_autofill_agent.h
View file

@ -18,10 +18,9 @@
namespace atom {
class AutofillAgent : public content::RenderFrameObserver,
public blink::WebAutofillClient {
public blink::WebAutofillClient {
public:
explicit AutofillAgent(content::RenderFrame* frame);
~AutofillAgent();
// content::RenderFrameObserver:
void OnDestruct() override;
@ -51,7 +50,6 @@ class AutofillAgent : public content::RenderFrameObserver,
};
bool OnMessageReceived(const IPC::Message& message) override;
void OnWebContentsRoutingIdReceived(int routing_id);
// blink::WebAutofillClient:
void textFieldDidEndEditing(const blink::WebInputElement&) override;
@ -73,10 +71,7 @@ class AutofillAgent : public content::RenderFrameObserver,
void DoFocusChangeComplete();
content::RenderFrame* render_frame_;
int web_contents_routing_id_;
Helper* helper_;
std::unique_ptr<Helper> helper_;
// True when the last click was on the focused node.
bool focused_node_was_last_clicked_;