Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2996)

Issues Search
    My Issues | Starred     Open | Closed | All

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:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm ('K') | « chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..46f9b5d6b79279a37964799aaf14deeda00a4642 100644
--- a/chrome/browser/ui/zoom/zoom_controller.cc
+++ b/chrome/browser/ui/zoom/zoom_controller.cc
@@ -54,8 +54,9 @@ bool ZoomController::IsAtDefaultZoom() const {
}
int ZoomController::GetResourceForZoomLevel() const {
- DCHECK(!IsAtDefaultZoom());
double zoom = web_contents()->GetZoomLevel();
+ if (IsAtDefaultZoom())
+ return IDR_ZOOM_NORMAL;
Dan Beam 2013/02/26 18:36:31 if (IsAtDefaultZoom()) return IDR_ZOOM_NORMAL;
sail 2013/02/26 22:04:15 Done.
return zoom > default_zoom_level_.GetValue() ? IDR_ZOOM_PLUS : IDR_ZOOM_MINUS;
}
« chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm ('K') | « chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698