chrome/browser/chrome_page_zoom.cc - Issue 769593003: Move ZoomObserver, ZoomController and ZoomEventManager to 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/chrome_page_zoom.cc

Issue 769593003: Move ZoomObserver, ZoomController and ZoomEventManager to components/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove obsolete defines in build files. Created 6 years 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

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..5de6b2e143348d1f4fccd2e8f2417f1d960d554d 100644

--- a/chrome/browser/chrome_page_zoom.cc

+++ b/chrome/browser/chrome_page_zoom.cc

@@ -10,7 +10,7 @@

#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 "components/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"

@@ -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);

+ ui_zoom::ZoomController* zoom_controller =

+ ui_zoom::ZoomController::FromWebContents(web_contents);

DCHECK(zoom_controller);

double current_zoom_level = zoom_controller->GetZoomLevel();

« no previous file with comments | « chrome/browser/browser_commands_unittest.cc ('k') | chrome/browser/devtools/devtools_window.cc » ('j') | no next file with comments »