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"
 #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/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/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"
 #include "components/autofill/content/common/autofill_messages.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "content/public/browser/render_view_host.h"
 #include "ui/gfx/rect.h"
 
 #if defined(OS_ANDROID)
 #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);
+  // Since ZoomController is also a WebContentsObservers, we need to be careful

[Avi (use Gerrit), 2014/07/10 17:39:26]

s/WebContentsObservers/WebContentsObserver/

+  // 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)
 }
 
 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) {
+  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