chrome/browser/ui/zoom/zoom_controller.cc - Issue 12315069: Mac: Update zoom bubble UI

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 12315069: Mac: Update zoom bubble UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: address review comments Created 7 years, 10 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 237509e709e60298634dd64fb7bbb07e4a8719c2..329222482bd85e0d60e483af7ed13cbaa7151b41 100644

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

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

@@ -54,7 +54,8 @@ bool ZoomController::IsAtDefaultZoom() const {

}

int ZoomController::GetResourceForZoomLevel() const {

- DCHECK(!IsAtDefaultZoom());

+ if (IsAtDefaultZoom())

+ return IDR_ZOOM_NORMAL;

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

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

}