chrome/browser/ui/webui/options/browser_options_handler.cc - Issue 2019423005: Move //components/ui/zoom to top-level under //components

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 2019423005: Move //components/ui/zoom to top-level under //components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 7 months 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

« no previous file with comments | « chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc ('k') | chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 a36066baaacef9b4708656324f125dec780982d4..d4e370f0a8755afd185f00ae6f2315ecf5d0b35a 100644

--- a/chrome/browser/ui/webui/options/browser_options_handler.cc

+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc

@@ -83,8 +83,8 @@

#include "components/signin/core/common/profile_management_switches.h"

#include "components/signin/core/common/signin_pref_names.h"

#include "components/strings/grit/components_strings.h"

-#include "components/ui/zoom/page_zoom.h"

#include "components/user_manager/user_type.h"

+#include "components/zoom/page_zoom.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/download_manager.h"

#include "content/public/browser/navigation_controller.h"

@@ -1987,7 +1987,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 =

- ui_zoom::PageZoom::PresetZoomFactors(default_zoom_factor);

+ 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.