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

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

Issue 1877373003: Disable zoom-in and zoom-out buttons in toolbar menu for a crashed page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added unit test Created 4 years, 8 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 | « no previous file | chrome/browser/ui/browser_unittest.cc » ('j') | chrome/browser/ui/views/toolbar/app_menu.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_commands.cc
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index e2bd5ce56ce78e40c54b0a6a1fc5eaca0b3e44b7..5854abcde67a52ee3aace5ec1de3ba49d26bbf1a 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -577,14 +577,15 @@ void CloseTab(Browser* browser) {
bool CanZoomIn(content::WebContents* contents) {
ui_zoom::ZoomController* zoom_controller =
ui_zoom::ZoomController::FromWebContents(contents);
- return zoom_controller->GetZoomPercent() != contents->GetMaximumZoomPercent();
+ return !contents->IsCrashed() &&
+ zoom_controller->GetZoomPercent() != contents->GetMaximumZoomPercent();
Peter Kasting 2016/04/12 23:39:56 Nit: Wrong indenting (2 places)
Tom (Use chromium acct) 2016/04/14 19:19:36 Done.
}
bool CanZoomOut(content::WebContents* contents) {
ui_zoom::ZoomController* zoom_controller =
ui_zoom::ZoomController::FromWebContents(contents);
- return zoom_controller->GetZoomPercent() !=
- contents->GetMinimumZoomPercent();
+ return !contents->IsCrashed() &&
+ zoom_controller->GetZoomPercent() != contents->GetMinimumZoomPercent();
}
bool CanResetZoom(content::WebContents* contents) {
« no previous file with comments | « no previous file | chrome/browser/ui/browser_unittest.cc » ('j') | chrome/browser/ui/views/toolbar/app_menu.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698