| Index: chrome/browser/ui/webui/options/browser_options_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| index 7d1874c0c99ae63fbbe98925f6fdf3c00d6057f9..1e12ddb11e31eae738e134eefc8ceba94a0a4feb 100644
|
| --- a/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| @@ -25,7 +25,6 @@
|
| #include "chrome/browser/auto_launch_trial.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/chrome_notification_types.h"
|
| -#include "chrome/browser/chrome_page_zoom.h"
|
| #include "chrome/browser/custom_home_pages_table_model.h"
|
| #include "chrome/browser/download/download_prefs.h"
|
| #include "chrome/browser/gpu/gpu_mode_manager.h"
|
| @@ -79,6 +78,7 @@
|
| #include "components/search_engines/template_url_service.h"
|
| #include "components/signin/core/browser/signin_manager.h"
|
| #include "components/signin/core/common/profile_management_switches.h"
|
| +#include "components/ui/zoom/page_zoom.h"
|
| #include "components/user_manager/user_type.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/download_manager.h"
|
| @@ -1926,7 +1926,7 @@ void BrowserOptionsHandler::SetupPageZoomSelector() {
|
| // Generate a vector of zoom factors from an array of known presets along with
|
| // the default factor added if necessary.
|
| std::vector<double> zoom_factors =
|
| - chrome_page_zoom::PresetZoomFactors(default_zoom_factor);
|
| + ui_zoom::PageZoom::PresetZoomFactors(default_zoom_factor);
|
|
|
| // Iterate through the zoom factors and and build the contents of the
|
| // selector that will be sent to the javascript handler.
|
|
|