| Index: chrome/browser/ui/app_list/start_page_service.cc
|
| diff --git a/chrome/browser/ui/app_list/start_page_service.cc b/chrome/browser/ui/app_list/start_page_service.cc
|
| index cf14a9ae54d27135979e75f808c7c7939031272c..89298fe4988eb8a12e7094f3c3da32dec68097bb 100644
|
| --- a/chrome/browser/ui/app_list/start_page_service.cc
|
| +++ b/chrome/browser/ui/app_list/start_page_service.cc
|
| @@ -38,7 +38,7 @@
|
| #include "components/prefs/pref_service.h"
|
| #include "components/search_engines/template_url_prepopulate_data.h"
|
| #include "components/search_engines/template_url_service.h"
|
| -#include "components/ui/zoom/zoom_controller.h"
|
| +#include "components/zoom/zoom_controller.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/notification_details.h"
|
| #include "content/public/browser/notification_observer.h"
|
| @@ -581,11 +581,11 @@ void StartPageService::DidNavigateMainFrame(
|
| //
|
| // Use a temporary zoom level for this web contents (aka isolated zoom
|
| // mode) so changes to its zoom aren't reflected in any preferences.
|
| - ui_zoom::ZoomController::FromWebContents(contents_.get())
|
| - ->SetZoomMode(ui_zoom::ZoomController::ZOOM_MODE_ISOLATED);
|
| + zoom::ZoomController::FromWebContents(contents_.get())
|
| + ->SetZoomMode(zoom::ZoomController::ZOOM_MODE_ISOLATED);
|
| // Set to have a zoom level of 0, which corresponds to 100%, so the
|
| // contents aren't affected by the browser's default zoom level.
|
| - ui_zoom::ZoomController::FromWebContents(contents_.get())->SetZoomLevel(0);
|
| + zoom::ZoomController::FromWebContents(contents_.get())->SetZoomLevel(0);
|
| }
|
|
|
| void StartPageService::DidFailProvisionalLoad(
|
| @@ -624,7 +624,7 @@ void StartPageService::LoadContents() {
|
| // The ZoomController needs to be created before the web contents is observed
|
| // by this object. Otherwise it will react to DidNavigateMainFrame after this
|
| // object does, resetting the zoom mode in the process.
|
| - ui_zoom::ZoomController::CreateForWebContents(contents_.get());
|
| + zoom::ZoomController::CreateForWebContents(contents_.get());
|
| Observe(contents_.get());
|
|
|
| LoadStartPageURL();
|
|
|