Index: components/autofill/renderer/page_click_tracker.cc |
diff --git a/components/autofill/renderer/page_click_tracker.cc b/components/autofill/renderer/page_click_tracker.cc |
index f1aae33733e1ec594e68507210cee9cdfbc5706b..4f0890e6e41ae04a8d4cbc90d1aae5f80a2d36cb 100644 |
--- a/components/autofill/renderer/page_click_tracker.cc |
+++ b/components/autofill/renderer/page_click_tracker.cc |
@@ -20,9 +20,11 @@ using WebKit::WebDOMMouseEvent; |
using WebKit::WebElement; |
using WebKit::WebFormControlElement; |
using WebKit::WebFrame; |
+using WebKit::WebGestureEvent; |
using WebKit::WebInputElement; |
using WebKit::WebInputEvent; |
using WebKit::WebMouseEvent; |
+using WebKit::WebTouchEvent; |
using WebKit::WebNode; |
using WebKit::WebString; |
using WebKit::WebView; |
@@ -74,20 +76,33 @@ PageClickTracker::~PageClickTracker() { |
// be invalid. |
} |
-void PageClickTracker::DidHandleMouseEvent(const WebMouseEvent& event) { |
- if (event.type != WebInputEvent::MouseDown || |
- last_node_clicked_.isNull()) { |
+void PageClickTracker::DidHandleMouseOrGestureEvent( |
+ const WebInputEvent& event, |
+ WebInputEvent::Type expected_type, |
+ autofill::InputEventSource source) { |
Ilya Sherman
2013/06/06 20:35:08
nit: No need for the "autofill::" prefix, as this
|
+ if (event.type != expected_type || last_node_clicked_.isNull()) { |
return; |
} |
Ilya Sherman
2013/06/06 20:35:08
nit: No need for curlies
|
- // We are only interested in text field clicks. |
+ // We are only interested in text field clicks and taps. |
const WebInputElement input_element = |
GetTextWebInputElement(last_node_clicked_); |
if (input_element.isNull()) |
return; |
bool is_focused = (last_node_clicked_ == render_view()->GetFocusedNode()); |
- listener_->InputElementClicked(input_element, was_focused_, is_focused); |
+ listener_->InputElementClicked(input_element, |
+ was_focused_, |
+ is_focused, |
+ source); |
+} |
+ |
+void PageClickTracker::DidHandleMouseEvent(const WebMouseEvent& event) { |
+ DidHandleMouseOrGestureEvent(event, WebInputEvent::MouseDown, MOUSE_CLICK); |
+} |
+ |
+void PageClickTracker::DidHandleGestureEvent(const WebGestureEvent& event) { |
+ DidHandleMouseOrGestureEvent(event, WebInputEvent::GestureTap, TAP_GESTURE); |
} |
void PageClickTracker::DidFinishDocumentLoad(WebKit::WebFrame* frame) { |