Index: chrome/browser/ui/browser_commands.cc |
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc |
index 06da9b87d2adbc23ce77c27d10b276b4af13e610..f6018130fcf5b8808b1729070054b0dfae405a2d 100644 |
--- a/chrome/browser/ui/browser_commands.cc |
+++ b/chrome/browser/ui/browser_commands.cc |
@@ -565,24 +565,23 @@ void CloseTab(Browser* browser) { |
browser->tab_strip_model()->CloseSelectedTabs(); |
} |
-bool CanZoomIn(content::WebContents* contents) { |
+bool IsAtMaximumZoom(content::WebContents* contents) { |
ui_zoom::ZoomController* zoom_controller = |
ui_zoom::ZoomController::FromWebContents(contents); |
- return zoom_controller->GetZoomPercent() != |
- contents->GetMaximumZoomPercent() + 1; |
+ return zoom_controller->GetZoomPercent() != contents->GetMaximumZoomPercent(); |
} |
Avi (use Gerrit)
2015/02/23 04:51:55
This rename appears wrong. "CanZoomIn" makes sense
|
-bool CanZoomOut(content::WebContents* contents) { |
+bool IsAtMinimumZoom(content::WebContents* contents) { |
ui_zoom::ZoomController* zoom_controller = |
ui_zoom::ZoomController::FromWebContents(contents); |
return zoom_controller->GetZoomPercent() != |
contents->GetMinimumZoomPercent(); |
} |
Avi (use Gerrit)
2015/02/23 04:51:55
This rename appears wrong. "CanZoomOut" makes sens
|
-bool ActualSize(content::WebContents* contents) { |
+bool IsAtDefaultZoom(content::WebContents* contents) { |
ui_zoom::ZoomController* zoom_controller = |
ui_zoom::ZoomController::FromWebContents(contents); |
- return zoom_controller->GetZoomPercent() != 100.0f; |
+ return zoom_controller->IsAtDefaultZoom(); |
} |
TabStripModelDelegate::RestoreTabType GetRestoreTabType( |