Remove FrameDetached and FrameWillClose listeners from AutofillAgent.

chrome/browser/ui/autofill/chrome_autofill_client.cc

 // Copyright 2014 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/browser/ui/autofill/chrome_autofill_client.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 #include "chrome/browser/ui/autofill/card_unmask_prompt_view.h"
 #include "chrome/browser/ui/autofill/credit_card_scanner_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/url_constants.h"
 #include "components/autofill/content/browser/content_autofill_driver.h"
 #include "components/autofill/content/common/autofill_messages.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/password_manager/content/browser/content_password_manager_driver.h"
-#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/render_frame_host.h"
 #include "ui/gfx/rect.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/chromium_application.h"
 #include "chrome/browser/ui/android/autofill/autofill_logger_android.h"
 #else
 #include "components/ui/zoom/zoom_controller.h"
 #endif
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(autofill::ChromeAutofillClient);
 
 namespace autofill {
 
 ChromeAutofillClient::ChromeAutofillClient(content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
+      last_rfh_to_rac_(nullptr),
       card_unmask_view_(nullptr),
       weak_pointer_factory_(this) {
   DCHECK(web_contents);
 
 #if !defined(OS_ANDROID)
   // Since ZoomController is also a WebContentsObserver, we need to be careful
   // about disconnecting from it since the relative order of destruction of
   // WebContentsObservers is not guaranteed. ZoomController silently clears
   // its ZoomObserver list during WebContentsDestroyed() so there's no need
   // to explicitly remove ourselves on destruction.
@@ skipping 92 matching lines @@
   return CreditCardScannerController::HasCreditCardScanFeature();
 }
 
 void ChromeAutofillClient::ScanCreditCard(
     const CreditCardScanCallback& callback) {
   CreditCardScannerController::ScanCreditCard(web_contents(), callback);
 }
 
 void ChromeAutofillClient::ShowRequestAutocompleteDialog(
     const FormData& form,
-    const GURL& source_url,
+    content::RenderFrameHost* render_frame_host,
     const ResultCallback& callback) {
   HideRequestAutocompleteDialog();
-
+  last_rfh_to_rac_ = render_frame_host;
+  GURL frame_url = render_frame_host->GetLastCommittedURL();
   dialog_controller_ = AutofillDialogController::Create(web_contents(), form,
-                                                        source_url, callback);
+                                                        frame_url, callback);
   if (dialog_controller_) {
     dialog_controller_->Show();
   } else {
     callback.Run(AutofillClient::AutocompleteResultErrorDisabled,
                  base::string16(),
                  NULL);
     NOTIMPLEMENTED();
   }
 }
 
@@ skipping 37 matching lines @@
   if (password_client)
     password_client->HidePasswordGenerationPopup();
 }
 
 bool ChromeAutofillClient::IsAutocompleteEnabled() {
   // For browser, Autocomplete is always enabled as part of Autofill.
   return GetPrefs()->GetBoolean(prefs::kAutofillEnabled);
 }
 
 void ChromeAutofillClient::HideRequestAutocompleteDialog() {
-  if (dialog_controller_.get())
+  if (dialog_controller_)
     dialog_controller_->Hide();
 }
 
+void ChromeAutofillClient::RenderFrameDeleted(
+    content::RenderFrameHost* render_frame_host) {
+  if (dialog_controller_ && render_frame_host == last_rfh_to_rac_)
+    HideRequestAutocompleteDialog();

[Dan Beam, 2014/12/20 01:10:51]

nit: create a HideIfLastRfhToRac(render_frame_host) and call from both places

+}
+
+void ChromeAutofillClient::DidNavigateAnyFrame(
+    content::RenderFrameHost* render_frame_host,
+    const content::LoadCommittedDetails& details,
+    const content::FrameNavigateParams& params) {
+  if (dialog_controller_ && render_frame_host == last_rfh_to_rac_)
+    HideRequestAutocompleteDialog();
+}
+
 void ChromeAutofillClient::WebContentsDestroyed() {
   HideAutofillPopup();
 }
 
 void ChromeAutofillClient::OnZoomChanged(
     const ui_zoom::ZoomController::ZoomChangedEventData& data) {
   HideAutofillPopup();
 }
 
 void ChromeAutofillClient::DetectAccountCreationForms(
@@ skipping 14 matching lines @@
                                                profile_full_name);
 #endif  // defined(OS_ANDROID)
 }
 
 void ChromeAutofillClient::OnFirstUserGestureObserved() {
   web_contents()->SendToAllFrames(
       new AutofillMsg_FirstUserGestureObservedInTab(routing_id()));
 }
 
 }  // namespace autofill