1 files changed, 17 insertions, 0 deletions
diff --git a/components/autofill/content/renderer/page_click_tracker.cc b/components/autofill/content/renderer/page_click_tracker.cc
index 6297bc0..8f1b0c2 100644
--- a/components/autofill/content/renderer/page_click_tracker.cc
+++ b/components/autofill/content/renderer/page_click_tracker.cc
@@ -4,8 +4,10 @@
 
 #include "components/autofill/content/renderer/page_click_tracker.h"
 
+#include "base/command_line.h"
 #include "components/autofill/content/renderer/form_autofill_util.h"
 #include "components/autofill/content/renderer/page_click_listener.h"
+#include "components/autofill/core/common/autofill_switches.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
 #include "third_party/WebKit/public/platform/WebPoint.h"
@@ -98,9 +100,24 @@ void PageClickTracker::DidHandleGestureEvent(const WebGestureEvent& event) {
 
 void PageClickTracker::FocusedNodeChanged(const WebNode& node) {
   was_focused_before_now_ = false;
+
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableAccessorySuggestionView)) {
+    focused_node_was_last_clicked_ = true;
+    DoFocusChangeComplete();
+  }
 }
 
 void PageClickTracker::FocusChangeComplete() {
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableAccessorySuggestionView)) {
+    return;
+  }
+
+  DoFocusChangeComplete();
+}
+
+void PageClickTracker::DoFocusChangeComplete() {
   WebNode focused_node = render_frame()->GetFocusedElement();
   if (focused_node_was_last_clicked_ && !focused_node.isNull()) {
     const WebInputElement input_element = GetTextWebInputElement(focused_node);