| Index: chrome/browser/chrome_page_zoom.cc
|
| diff --git a/chrome/browser/chrome_page_zoom.cc b/chrome/browser/chrome_page_zoom.cc
|
| index f7aa39208e13d9857e882103c8abc04d0cbd5cdf..f5baaec875b4e8ef14a054103e5d6356703ffb17 100644
|
| --- a/chrome/browser/chrome_page_zoom.cc
|
| +++ b/chrome/browser/chrome_page_zoom.cc
|
| @@ -10,13 +10,13 @@
|
| #include "base/prefs/pref_service.h"
|
| #include "chrome/browser/chrome_page_zoom_constants.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| -#include "chrome/browser/ui/zoom/zoom_controller.h"
|
| #include "content/public/browser/host_zoom_map.h"
|
| #include "content/public/browser/render_view_host.h"
|
| #include "content/public/browser/user_metrics.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/common/page_zoom.h"
|
| #include "content/public/common/renderer_preferences.h"
|
| +#include "extensions/browser/ui/zoom/zoom_controller.h"
|
|
|
| using base::UserMetricsAction;
|
|
|
| @@ -66,8 +66,8 @@ std::vector<double> PresetZoomLevels(double custom_level) {
|
| }
|
|
|
| void Zoom(content::WebContents* web_contents, content::PageZoom zoom) {
|
| - ZoomController* zoom_controller =
|
| - ZoomController::FromWebContents(web_contents);
|
| + extensions::ZoomController* zoom_controller =
|
| + extensions::ZoomController::FromWebContents(web_contents);
|
| DCHECK(zoom_controller);
|
|
|
| double current_zoom_level = zoom_controller->GetZoomLevel();
|
|
|