chrome/browser/ui/zoom/zoom_controller.cc - Issue 287093002: Remove ViewMsg_SetZoomLevel

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/zoom/zoom_controller.cc

Issue 287093002: Remove ViewMsg_SetZoomLevel (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add std:: namespace to find() to fix Android compile. Created 6 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:

Index: chrome/browser/ui/zoom/zoom_controller.cc

diff --git a/chrome/browser/ui/zoom/zoom_controller.cc b/chrome/browser/ui/zoom/zoom_controller.cc

index 64ac8efe22d39da6163d5c3e0312324aee2562f3..701c0dd24ad34d1fe66524ff1602021d9486933a 100644

--- a/chrome/browser/ui/zoom/zoom_controller.cc

+++ b/chrome/browser/ui/zoom/zoom_controller.cc

@@ -44,14 +44,15 @@ ZoomController::ZoomController(content::WebContents* web_contents)

ZoomController::~ZoomController() {}

bool ZoomController::IsAtDefaultZoom() const {

- return content::ZoomValuesEqual(web_contents()->GetZoomLevel(),

- default_zoom_level_.GetValue());

+ return content::ZoomValuesEqual(

+ content::HostZoomMap::GetZoomLevel(web_contents()),

+ default_zoom_level_.GetValue());

}

int ZoomController::GetResourceForZoomLevel() const {

if (IsAtDefaultZoom())

return IDR_ZOOM_NORMAL;

- double zoom = web_contents()->GetZoomLevel();

+ double zoom = content::HostZoomMap::GetZoomLevel(web_contents());

return zoom > default_zoom_level_.GetValue() ? IDR_ZOOM_PLUS : IDR_ZOOM_MINUS;

}