[autofill] When hiding popups in the renderer also hide those in the browser.

chrome/renderer/autofill/autofill_agent.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/autofill/autofill_agent.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/string_split.h"
@@ skipping 186 matching lines @@
                                NULL)) {
     Send(new AutofillHostMsg_FormSubmitted(routing_id(), form_data,
                                            base::TimeTicks::Now()));
   }
 }
 
 void AutofillAgent::ZoomLevelChanged() {
   // Any time the zoom level changes, the page's content moves, so any Autofill
   // popups should be hidden. This is only needed for the new Autofill UI
   // because WebKit already knows to hide the old UI when this occurs.
-  Send(new AutofillHostMsg_HideAutofillPopup(routing_id()));
+  HideHostPopups();
 }
 
 void AutofillAgent::DidChangeScrollOffset(WebKit::WebFrame*) {
   // Any time the scroll offset changes, the page's content moves, so Autofill
   // popups should be hidden. This is only needed for the new Autofill UI
   // because WebKit already knows to hide the old UI when this occurs.
-  Send(new AutofillHostMsg_HideAutofillPopup(routing_id()));
+  HideHostPopups();
 }
 
 void AutofillAgent::didRequestAutocomplete(WebKit::WebFrame* frame,
                                            const WebFormElement& form) {
   FormData form_data;
   if (!in_flight_request_form_.isNull() ||
       !WebFormElementToFormData(form,
                                 WebFormControlElement(),
                                 REQUIRE_AUTOCOMPLETE,
                                 EXTRACT_NONE,
@@ skipping 15 matching lines @@
 bool AutofillAgent::InputElementClicked(const WebInputElement& element,
                                         bool was_focused,
                                         bool is_focused) {
   if (was_focused)
     ShowSuggestions(element, true, false, true);
 
   return false;
 }
 
 bool AutofillAgent::InputElementLostFocus() {
-  Send(new AutofillHostMsg_HideAutofillPopup(routing_id()));
+  HideHostPopups();
 
   return false;
 }
 
 void AutofillAgent::didAcceptAutofillSuggestion(const WebNode& node,
                                                 const WebString& value,
                                                 const WebString& label,
                                                 int item_id,
                                                 unsigned index) {
   if (password_autofill_manager_->DidAcceptAutofillSuggestion(node, value))
@@ skipping 221 matching lines @@
     i.push_back(string16());
     ids.push_back(WebAutofillClient::MenuItemIDSeparator);
   }
 
   // Append the Autofill suggestions.
   v.insert(v.end(), values.begin(), values.end());
   l.insert(l.end(), labels.begin(), labels.end());
   i.insert(i.end(), icons.begin(), icons.end());
   ids.insert(ids.end(), item_ids.begin(), item_ids.end());
 
+  if (v.empty()) {
+    // No suggestions, any popup currently showing is obsolete.
+    HidePopups();
+    return;
+  }
+
   WebKit::WebView* web_view = render_view()->GetWebView();
   if (!web_view)
     return;
 
-  if (v.empty()) {
-    // No suggestions, any popup currently showing is obsolete.
-    web_view->hidePopups();
-    return;
-  }
-
   // Send to WebKit for display.
   web_view->applyAutofillSuggestions(element, v, l, i, ids);
 
   Send(new AutofillHostMsg_DidShowAutofillSuggestions(
       routing_id(),
       has_autofill_item && !has_shown_autofill_popup_for_current_edit_));
   has_shown_autofill_popup_for_current_edit_ |= has_autofill_item;
 }
 
 void AutofillAgent::AcceptDataListSuggestion(const string16& suggested_value) {
@@ skipping 210 matching lines @@
   string16 substring = value;
   substring = substring.substr(0, node->maxLength());
 
   node->setEditingValue(substring);
 }
 
 void AutofillAgent::HidePopups() {
   WebKit::WebView* web_view = render_view()->GetWebView();
   if (web_view)
     web_view->hidePopups();
+
+  HideHostPopups();
+}
+
+void AutofillAgent::HideHostPopups() {
+  Send(new AutofillHostMsg_HideAutofillPopup(routing_id()));
 }
 
 }  // namespace autofill