Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7447)

Unified Diff: chrome/browser/ui/autofill/chrome_autofill_client.cc

Issue 769593003: Move ZoomObserver, ZoomController and ZoomEventManager to components/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make it static_library, ditch export macros. Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 5aa836cb049d6db5be3714bec1df0670c3f5b2e3..2c3ed0d3ff99d9b14960dc2c93b9549e3678b0a9 100644
--- a/chrome/browser/ui/autofill/chrome_autofill_client.cc
+++ b/chrome/browser/ui/autofill/chrome_autofill_client.cc
@@ -32,7 +32,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 "components/ui/zoom/zoom_controller.h"
#endif
DEFINE_WEB_CONTENTS_USER_DATA_KEY(autofill::ChromeAutofillClient);
@@ -49,8 +49,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);
+ ui_zoom::ZoomController* zoom_controller =
+ ui_zoom::ZoomController::FromWebContents(web_contents);
// There may not always be a ZoomController, e.g. in tests.
if (zoom_controller)
zoom_controller->AddObserver(this);
@@ -201,7 +201,7 @@ void ChromeAutofillClient::WebContentsDestroyed() {
}
void ChromeAutofillClient::OnZoomChanged(
- const ZoomController::ZoomChangedEventData& data) {
+ const ui_zoom::ZoomController::ZoomChangedEventData& data) {
HideAutofillPopup();
}

Powered by Google App Engine
This is Rietveld 408576698