| Index: chrome/browser/ui/browser.h
|
| diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
|
| index e32cc5750981f5001b31bf3575a519d9bcb46707..47b7c4940544fc293c0e030ce24a0f9000d1b2e7 100644
|
| --- a/chrome/browser/ui/browser.h
|
| +++ b/chrome/browser/ui/browser.h
|
| @@ -39,7 +39,7 @@
|
| #include "components/sessions/core/session_id.h"
|
| #include "components/toolbar/toolbar_model.h"
|
| #include "components/translate/content/browser/content_translate_driver.h"
|
| -#include "components/ui/zoom/zoom_observer.h"
|
| +#include "components/zoom/zoom_observer.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| #include "content/public/browser/page_navigator.h"
|
| @@ -112,7 +112,7 @@ class Browser : public TabStripModelObserver,
|
| public SearchTabHelperDelegate,
|
| public ChromeWebModalDialogManagerDelegate,
|
| public BookmarkTabHelperDelegate,
|
| - public ui_zoom::ZoomObserver,
|
| + public zoom::ZoomObserver,
|
| public content::PageNavigator,
|
| public content::NotificationObserver,
|
| #if defined(ENABLE_EXTENSIONS)
|
| @@ -709,7 +709,7 @@ class Browser : public TabStripModelObserver,
|
|
|
| // Overridden from ZoomObserver:
|
| void OnZoomChanged(
|
| - const ui_zoom::ZoomController::ZoomChangedEventData& data) override;
|
| + const zoom::ZoomController::ZoomChangedEventData& data) override;
|
|
|
| // Overridden from SelectFileDialog::Listener:
|
| void FileSelected(const base::FilePath& path,
|
|
|