[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 187 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) {
   if (has_requested_autocomplete_)
     return;
 
   // Cancel any pending Autofill requests.
   ++autofill_query_id_;
 
   // Any popup currently showing is obsolete.
   HidePopups();
+  HideHostPopups();
 
   FormData form_data;
   if (WebFormElementToFormData(form,
                                WebFormControlElement(),
                                REQUIRE_AUTOCOMPLETE,
                                EXTRACT_NONE,
                                &form_data,
                                NULL)) {
     form_ = form;
     has_requested_autocomplete_ = true;
     Send(new AutofillHostMsg_RequestAutocomplete(routing_id(), form_data));
   }
 }
 
 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 228 matching lines @@
   i.insert(i.end(), icons.begin(), icons.end());
   ids.insert(ids.end(), item_ids.begin(), item_ids.end());
 
   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();
+    HideHostPopups();
     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;
@@ skipping 112 matching lines @@
   // Don't attempt to autofill with values that are too large or if filling
   // criteria are not met.
   WebString value = element.editingValue();
   if (value.length() > kMaximumTextSizeForAutofill ||
       (!autofill_on_empty_values && value.isEmpty()) ||
       (requires_caret_at_end &&
        (element.selectionStart() != element.selectionEnd() ||
         element.selectionEnd() != static_cast<int>(value.length())))) {
     // Any popup currently showing is obsolete.
     HidePopups();
+    HideHostPopups();
     return;
   }
 
   element_ = element;
 
   // If autocomplete is disabled at the form level, then we might want to show
   // a warning in place of suggestions. However, if autocomplete is disabled
   // specifically for this field, we never want to show a warning. Otherwise,
   // we might interfere with custom popups (e.g. search suggestions) used by
   // the website. Also, if the field has no name, then we won't have values.
@@ skipping 83 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();
 }

[Ilya Sherman, 2012/10/29 23:14:19]

nit: I think this should also call HideHostPopups(), rather than requiring the
caller to call both in sequence.

[Dan Beam, 2012/10/30 00:44:15]

Done.

 
+void AutofillAgent::HideHostPopups() {
+  Send(new AutofillHostMsg_HideAutofillPopup(routing_id()));
+}
+
 }  // namespace autofill