Make ChromeAutofillClient a ZoomObserver.

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"
@@ skipping 19 matching lines @@
 #include "chrome/browser/ui/android/autofill/autofill_logger_android.h"
 #endif
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(autofill::ChromeAutofillClient);
 
 namespace autofill {
 
 ChromeAutofillClient::ChromeAutofillClient(content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents), web_contents_(web_contents) {
   DCHECK(web_contents);
+  ZoomController* zoom_controller =
+      ZoomController::FromWebContents(web_contents);
+  // No ZoomControllers on Android.
+  if (zoom_controller)
+    zoom_controller->AddObserver(this);
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   RegisterForKeystoneNotifications();
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 }
 
 ChromeAutofillClient::~ChromeAutofillClient() {
   // NOTE: It is too late to clean up the autofill popup; that cleanup process
   // requires that the WebContents instance still be valid and it is not at
   // this point (in particular, the WebContentsImpl destructor has already
   // finished running and we are now in the base class destructor).
@@ skipping 115 matching lines @@
 
 void ChromeAutofillClient::HideRequestAutocompleteDialog() {
   if (dialog_controller_.get())
     dialog_controller_->Hide();
 }
 
 void ChromeAutofillClient::WebContentsDestroyed() {
   HideAutofillPopup();
 }
 
+void ChromeAutofillClient::OnZoomChanged(
+    const ZoomController::ZoomChangedEventData& data) {
+  // TODO(wjmaclean) Decide if we want to hide the popup for any zoom event, not
+  // just zoom events for web_contents_.

[Ilya Sherman, 2014/07/09 21:52:43]

What other zoom events are possible?

[wjmaclean, 2014/07/10 14:47:35]

ZoomObservers are notified of the following:
1) changes in zoom level
2) changes in zoom mode (as defined in ZoomController)

(2) & (1) sometimes occur together.

Thinking some more on this, because the ChromeAutofillClient is tied to a single
WebContents, this check will always be true (some ZoomObservers listen to
multiple ZoomControllers, thus the reason the event data carries with
web_contents pointer with it.

+  if (data.web_contents == web_contents_)
+    HideAutofillPopup();
+}
+
 void ChromeAutofillClient::DetectAccountCreationForms(
     const std::vector<autofill::FormStructure*>& forms) {
   password_manager::PasswordGenerationManager* manager =
       ChromePasswordManagerClient::GetGenerationManagerFromWebContents(
           web_contents_);
   if (manager)
     manager->DetectAccountCreationForms(forms);
 }
 
 void ChromeAutofillClient::DidFillOrPreviewField(
     const base::string16& autofilled_value,
     const base::string16& profile_full_name) {
 #if defined(OS_ANDROID)
   AutofillLoggerAndroid::DidFillOrPreviewField(autofilled_value,
                                                profile_full_name);
 #endif  // defined(OS_ANDROID)
 }
 
 }  // namespace autofill