| Index: chrome/browser/ui/autofill/chrome_autofill_client.cc
|
| diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.cc b/chrome/browser/ui/autofill/chrome_autofill_client.cc
|
| index c008944acd3757ab1d46bef5e3e951b49b2129ad..35fa2df12a35e316fe790818d4ff3408992ca0c7 100644
|
| --- a/chrome/browser/ui/autofill/chrome_autofill_client.cc
|
| +++ b/chrome/browser/ui/autofill/chrome_autofill_client.cc
|
| @@ -31,7 +31,7 @@
|
| #include "chrome/browser/android/chromium_application.h"
|
| #include "chrome/browser/ui/android/autofill/autofill_logger_android.h"
|
| #else
|
| -#include "chrome/browser/ui/zoom/zoom_controller.h"
|
| +#include "extensions/browser/ui/zoom/zoom_controller.h"
|
| #endif
|
|
|
| DEFINE_WEB_CONTENTS_USER_DATA_KEY(autofill::ChromeAutofillClient);
|
| @@ -48,8 +48,8 @@ ChromeAutofillClient::ChromeAutofillClient(content::WebContents* web_contents)
|
| // 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);
|
| + extensions::ZoomController* zoom_controller =
|
| + extensions::ZoomController::FromWebContents(web_contents);
|
| // There may not always be a ZoomController, e.g. in tests.
|
| if (zoom_controller)
|
| zoom_controller->AddObserver(this);
|
| @@ -200,7 +200,7 @@ void ChromeAutofillClient::WebContentsDestroyed() {
|
| }
|
|
|
| void ChromeAutofillClient::OnZoomChanged(
|
| - const ZoomController::ZoomChangedEventData& data) {
|
| + const extensions::ZoomController::ZoomChangedEventData& data) {
|
| HideAutofillPopup();
|
| }
|
|
|
|
|