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

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

Issue 954923005: Make command-zero reset page scale in addition to zoom level (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit tests Created 5 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
« no previous file with comments | « chrome/browser/browser_commands_unittest.cc ('k') | components/ui/zoom/page_zoom.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_command_controller.cc
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
index d0c8e571aac62fd370a580abd4958056fe40c4e7..ce0b1b978024abea57a3c8fe00b7223548f82937 100644
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -1143,8 +1143,9 @@ void BrowserCommandController::UpdateCommandsForZoomState() {
if (!contents)
return;
command_updater_.UpdateCommandEnabled(IDC_ZOOM_PLUS, CanZoomIn(contents));
- command_updater_.UpdateCommandEnabled(IDC_ZOOM_NORMAL, ActualSize(contents));
command_updater_.UpdateCommandEnabled(IDC_ZOOM_MINUS, CanZoomOut(contents));
+ // Reset zoom is always enabled because it also resets page scale.
+ command_updater_.UpdateCommandEnabled(IDC_ZOOM_NORMAL, true);
Avi (use Gerrit) 2015/02/26 20:16:58 Can we have it be enabled only if _either_ there i
ccameron 2015/02/26 20:23:06 That information is really deep the renderer and c
Nico 2015/02/26 20:35:22 You only need to send "is at no pinch" and "is at
}
void BrowserCommandController::UpdateCommandsForContentRestrictionState() {
« no previous file with comments | « chrome/browser/browser_commands_unittest.cc ('k') | components/ui/zoom/page_zoom.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698