[Password Manager] Suppress UI when password generation is active

components/autofill/content/renderer/autofill_agent.cc

 // Copyright 2013 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 "components/autofill/content/renderer/autofill_agent.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
@@ skipping 138 matching lines @@
     : content::RenderFrameObserver(render_frame),
       form_cache_(*render_frame->GetWebFrame()),
       password_autofill_agent_(password_autofill_agent),
       password_generation_agent_(password_generation_agent),
       legacy_(render_frame->GetRenderView(), this),
       autofill_query_id_(0),
       was_query_node_autofilled_(false),
       has_shown_autofill_popup_for_current_edit_(false),
       ignore_text_changes_(false),
       is_popup_possibly_visible_(false),
+      is_generation_popup_possibly_visible_(false),
       weak_ptr_factory_(this) {
   render_frame->GetWebFrame()->setAutofillClient(this);
 
   // This owns itself, and will delete itself when |render_frame| is destructed
-  // (same as AutofillAgent).
+  // (same as AutofillAgent). This object must be constructed after
+  // AutofillAgent so that password generation UI is shown before password
+  // manager UI (see https://crbug.com/498545).
   new PageClickTracker(render_frame, this);
 }
 
 AutofillAgent::~AutofillAgent() {}
 
 bool AutofillAgent::FormDataCompare::operator()(const FormData& lhs,
                                                 const FormData& rhs) const {
   if (lhs.name != rhs.name)
     return lhs.name < rhs.name;
   if (lhs.origin != rhs.origin)
@@ skipping 99 matching lines @@
 }
 
 void AutofillAgent::FocusChangeComplete() {
   WebDocument doc = render_frame()->GetWebFrame()->document();
   WebElement focused_element;
   if (!doc.isNull())
     focused_element = doc.focusedElement();
 
   if (!focused_element.isNull() && password_generation_agent_ &&
       password_generation_agent_->FocusedNodeHasChanged(focused_element)) {
+    is_generation_popup_possibly_visible_ = true;
     is_popup_possibly_visible_ = true;
   }
 }
 
 void AutofillAgent::didRequestAutocomplete(
     const WebFormElement& form) {
   DCHECK_EQ(form.document().frame(), render_frame()->GetWebFrame());
 
   // Disallow the dialog over non-https or broken https, except when the
   // ignore SSL flag is passed. See http://crbug.com/272512.
@@ skipping 52 matching lines @@
     const WebFormControlElement& element,
     bool was_focused) {
   // TODO(estade): Remove this check when PageClickTracker is per-frame.
   if (element.document().frame() != render_frame()->GetWebFrame())
     return;
 
   const WebInputElement* input_element = toWebInputElement(&element);
   if (!input_element && !IsTextAreaElement(element))
     return;
 
+  if (is_generation_popup_possibly_visible_)
+    return;
+
   ShowSuggestionsOptions options;
   options.autofill_on_empty_values = true;
   options.show_full_suggestion_list = element.isAutofilled();
 
   // On Android, default to showing the dropdown on field focus.
   // On desktop, require an extra click after field focus.
   // See http://crbug.com/427660
 #if defined(OS_ANDROID)
   bool single_click_autofill =
       !base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 285 matching lines @@
        (options.requires_caret_at_end &&
         (element.selectionStart() != element.selectionEnd() ||
          element.selectionEnd() != static_cast<int>(value.length()))))) {
     // Any popup currently showing is obsolete.
     HidePopup();
     return;
   }
 
   element_ = element;
   if (IsAutofillableInputElement(input_element) &&
-      (password_autofill_agent_->ShowSuggestions(
-           *input_element, options.show_full_suggestion_list) ||
-       options.show_password_suggestions_only)) {
+      password_autofill_agent_->ShowSuggestions(
+          *input_element, options.show_full_suggestion_list)) {
     is_popup_possibly_visible_ = true;
     return;
   }
 
+  if (options.show_password_suggestions_only)
+    return;

[Ilya Sherman, 2015/06/16 02:24:09]

This is a small bugfix that's otherwise unrelated to your change, right?

[Garrett Casto, 2015/06/16 06:15:04]

Yes. My original intent was to not introduce a new boolean and just use
|is_popup_possibly_visible_|. However, this has the side effect of not
re-showing Autofill UI if you dismiss it without changing focus (e.g. pressing
escape). I left this change in since it's slightly more efficient. 

+
   // Password field elements should only have suggestions shown by the password
   // autofill agent.
   if (input_element && input_element->isPasswordField())
     return;
 
   QueryAutofillSuggestions(element, options.datalist_only);
 }
 
 void AutofillAgent::QueryAutofillSuggestions(
     const WebFormControlElement& element,
@@ skipping 69 matching lines @@
   if (!forms.empty() || !frame->parent()) {
     Send(new AutofillHostMsg_FormsSeen(routing_id(), forms,
                                        forms_seen_timestamp));
   }
 }
 
 void AutofillAgent::HidePopup() {
   if (!is_popup_possibly_visible_)
     return;
   is_popup_possibly_visible_ = false;
+  is_generation_popup_possibly_visible_ = false;
   Send(new AutofillHostMsg_HidePopup(routing_id()));
 }
 
 bool AutofillAgent::IsUserGesture() const {
   return WebUserGestureIndicator::isProcessingUserGesture();
 }
 
 void AutofillAgent::didAssociateFormControls(const WebVector<WebNode>& nodes) {
   for (size_t i = 0; i < nodes.size(); ++i) {
     WebLocalFrame* frame = nodes[i].document().frame();
@@ skipping 28 matching lines @@
 
 void AutofillAgent::LegacyAutofillAgent::OnDestruct() {
   // No-op. Don't delete |this|.
 }
 
 void AutofillAgent::LegacyAutofillAgent::FocusChangeComplete() {
   agent_->FocusChangeComplete();
 }
 
 }  // namespace autofill