Make ChromeAutofillClient a ZoomObserver.
In r273854 we may have removed an indirect pathway used to close open
autofill popups when the associated web_contents undergoes a zoom
change. This CL replaces that by directly registering the
ChromeAutofillClient as a ZoomObserver, allowing it to directly
react to zoom events.
BUG=392412
Review URL: https://codereview.chromium.org/377423002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282453 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.cc b/chrome/browser/ui/autofill/chrome_autofill_client.cc
index d8489171..628e2e8 100644
--- a/chrome/browser/ui/autofill/chrome_autofill_client.cc
+++ b/chrome/browser/ui/autofill/chrome_autofill_client.cc
@@ -18,6 +18,7 @@
#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/ui/zoom/zoom_controller.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"
@@ -37,6 +38,16 @@
ChromeAutofillClient::ChromeAutofillClient(content::WebContents* web_contents)
: content::WebContentsObserver(web_contents), web_contents_(web_contents) {
DCHECK(web_contents);
+ // 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.
+ ZoomController* zoom_controller =
+ ZoomController::FromWebContents(web_contents);
+ // There may not always be a ZoomController, e.g. on Android.
+ if (zoom_controller)
+ zoom_controller->AddObserver(this);
#if defined(OS_MACOSX) && !defined(OS_IOS)
RegisterForKeystoneNotifications();
#endif // defined(OS_MACOSX) && !defined(OS_IOS)
@@ -172,6 +183,11 @@
HideAutofillPopup();
}
+void ChromeAutofillClient::OnZoomChanged(
+ const ZoomController::ZoomChangedEventData& data) {
+ HideAutofillPopup();
+}
+
void ChromeAutofillClient::DetectAccountCreationForms(
const std::vector<autofill::FormStructure*>& forms) {
password_manager::PasswordGenerationManager* manager =
