chrome/browser/renderer_preferences_util.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/renderer_preferences_util.cc

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

Patch Set: Move ui_zoom stuff to components instead. 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

« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/ui/apps/chrome_app_delegate.cc » ('j') | chrome/browser/ui/cocoa/location_bar/zoom_decoration_unittest.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_preferences_util.cc

diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc

index bf1e2e082c6189add5c3457989da0cbdf16bd8ef..fd33852ed60d7b63e0c09aa1c34fe29bfce9e0c4 100644

--- a/chrome/browser/renderer_preferences_util.cc

+++ b/chrome/browser/renderer_preferences_util.cc

@@ -18,7 +18,7 @@

#endif

#if !defined(OS_ANDROID)

-#include "chrome/browser/ui/zoom/zoom_controller.h"

+#include "components/ui/zoom/zoom_controller.h"

#endif

#if defined(TOOLKIT_VIEWS)

@@ -44,8 +44,8 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,

double default_zoom_level = -1;

#if !defined(OS_ANDROID)

- ZoomController* zoom_controller =

- ZoomController::FromWebContents(web_contents);

+ components::ZoomController* zoom_controller =

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

if (zoom_controller)

default_zoom_level = zoom_controller->GetDefaultZoomLevel();

#endif