Stop offering Autocheckout bubble on the forms of no interest.

components/autofill/renderer/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 "components/autofill/renderer/autofill_agent.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 134 matching lines @@
       autofill_action_(AUTOFILL_NONE),
       topmost_frame_(NULL),
       web_view_(render_view->GetWebView()),
       display_warning_if_disabled_(false),
       was_query_node_autofilled_(false),
       has_shown_autofill_popup_for_current_edit_(false),
       did_set_node_text_(false),
       autocheckout_click_in_progress_(false),
       is_autocheckout_supported_(false),
       has_new_forms_for_browser_(false),
-      try_to_show_autocheckout_bubble_(false),
       ignore_text_changes_(false),
       weak_ptr_factory_(this) {
   render_view->GetWebView()->setAutofillClient(this);
 
   // The PageClickTracker is a RenderViewObserver, and hence will be freed when
   // the RenderView is destroyed.
   new PageClickTracker(render_view, this);
 }
 
 AutofillAgent::~AutofillAgent() {}
@@ skipping 56 matching lines @@
   if (!forms.empty() || !frame->parent()) {
     Send(new AutofillHostMsg_FormsSeen(routing_id(), forms,
                                        forms_seen_timestamp_,
                                        state));
   }
 }
 
 void AutofillAgent::DidStartProvisionalLoad(WebFrame* frame) {
   if (!frame->parent()) {
     is_autocheckout_supported_ = false;
-    try_to_show_autocheckout_bubble_ = false;
     topmost_frame_ = NULL;
     if (click_timer_.IsRunning()) {
       click_timer_.Stop();
       autocheckout_click_in_progress_ = true;
     }
   }
 }
 
 void AutofillAgent::DidFailProvisionalLoad(WebFrame* frame,
                                            const WebKit::WebURLError& error) {
@@ skipping 55 matching lines @@
   if (!element || !element->isEnabled() || element->isReadOnly() ||
       !element->isTextField() || element->isPasswordField())
     return;
 
   element_ = *element;
 
   MaybeShowAutocheckoutBubble();
 }
 
 void AutofillAgent::MaybeShowAutocheckoutBubble() {
-  if (!try_to_show_autocheckout_bubble_ || element_.isNull() ||
-      !element_.focused())
+  if (element_.isNull() || !element_.focused())
     return;
 
   FormData form;
   FormFieldData field;
   // This must be called to short circuit this method if it fails.
   if (!FindFormAndFieldForInputElement(element_, &form, &field, REQUIRE_NONE))
     return;
 
-  content::SSLStatus ssl_status = render_view()->GetSSLStatusOfFrame(
+  form.ssl_status = render_view()->GetSSLStatusOfFrame(
       element_.document().frame());
 
   Send(new AutofillHostMsg_MaybeShowAutocheckoutBubble(
       routing_id(),
-      form.origin,
-      ssl_status,
+      form,
       GetScaledBoundingBox(web_view_->pageScaleFactor(), &element_)));
-
-  // We should only try once.
-  try_to_show_autocheckout_bubble_ = false;
 }
 
 void AutofillAgent::DidChangeScrollOffset(WebKit::WebFrame*) {
   HideAutofillUi();
 }
 
 void AutofillAgent::didRequestAutocomplete(WebKit::WebFrame* frame,
                                            const WebFormElement& form) {
   FormData form_data;
   if (!in_flight_request_form_.isNull() ||
@@ skipping 445 matching lines @@
   if (!ClickElement(topmost_frame_->document(),
                     click_element_descriptor)) {
     click_timer_.Stop();
     Send(new AutofillHostMsg_ClickFailed(routing_id(),
                                          MISSING_ADVANCE));
   }
 }
 
 void AutofillAgent::OnAutocheckoutSupported() {
   is_autocheckout_supported_ = true;
-  try_to_show_autocheckout_bubble_ = true;
   if (has_new_forms_for_browser_)
     MaybeSendDynamicFormsSeen();
   MaybeShowAutocheckoutBubble();
 }
 
 void AutofillAgent::ClickFailed() {
   Send(new AutofillHostMsg_ClickFailed(routing_id(),
                                        CANNOT_PROCEED));
 }
 
@@ skipping 178 matching lines @@
   if (!forms.empty()) {
     if (click_timer_.IsRunning())
       click_timer_.Stop();
     Send(new AutofillHostMsg_FormsSeen(routing_id(), forms,
                                        forms_seen_timestamp_,
                                        state));
   }
 }
 
 }  // namespace autofill