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

Unified Diff: chrome/browser/ui/browser_commands.cc

Issue 678343002: Default zoom was never read from chrome://settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Replaced header in testing_profile Created 6 years, 1 month 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
Index: chrome/browser/ui/browser_commands.cc
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index 74ca4de74f1bd1485d2b17598cdd8569517cf49d..5e3c96e18093ee19f6621fdfdd8dd796bcb91856 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -598,21 +598,21 @@ void CloseTab(Browser* browser) {
browser->tab_strip_model()->CloseSelectedTabs();
}
-bool CanZoomIn(content::WebContents* contents) {
+bool IsAtMaximumZoom(content::WebContents* contents) {
ZoomController* zoom_controller = ZoomController::FromWebContents(contents);
return zoom_controller->GetZoomPercent() !=
contents->GetMaximumZoomPercent() + 1;
sky 2014/11/24 15:46:57 Why the +1 here?
sarka 2015/02/26 15:37:22 If I remember correct contents->GetMaximumZoomPerc
}
-bool CanZoomOut(content::WebContents* contents) {
+bool IsAtMinimumZoom(content::WebContents* contents) {
ZoomController* zoom_controller = ZoomController::FromWebContents(contents);
return zoom_controller->GetZoomPercent() !=
contents->GetMinimumZoomPercent();
}
-bool ActualSize(content::WebContents* contents) {
+bool IsAtDefaultZoom(content::WebContents* contents) {
ZoomController* zoom_controller = ZoomController::FromWebContents(contents);
- return zoom_controller->GetZoomPercent() != 100.0f;
+ return zoom_controller->IsAtDefaultZoom();
}
TabStripModelDelegate::RestoreTabType GetRestoreTabType(

Powered by Google App Engine
This is Rietveld 408576698