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

Unified Diff: chrome/browser/ui/views/toolbar/app_menu.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
Index: chrome/browser/ui/views/toolbar/app_menu.cc
diff --git a/chrome/browser/ui/views/toolbar/app_menu.cc b/chrome/browser/ui/views/toolbar/app_menu.cc
index 5cee86832ae3396e4b4c76212220bbd13796c8b4..59b2163419dc247ddec7628b315d477a2c858591 100644
--- a/chrome/browser/ui/views/toolbar/app_menu.cc
+++ b/chrome/browser/ui/views/toolbar/app_menu.cc
@@ -666,10 +666,12 @@ class AppMenu::ZoomView : public AppMenuView {
ui_zoom::ZoomController::FromWebContents(selected_tab);
if (zoom_controller)
zoom = zoom_controller->GetZoomPercent();
- increment_button_->SetEnabled(zoom <
- selected_tab->GetMaximumZoomPercent());
- decrement_button_->SetEnabled(zoom >
- selected_tab->GetMinimumZoomPercent());
+ increment_button_->SetEnabled(
+ !selected_tab->IsCrashed() &&
+ zoom < selected_tab->GetMaximumZoomPercent());
+ decrement_button_->SetEnabled(
+ !selected_tab->IsCrashed() &&
+ zoom > selected_tab->GetMinimumZoomPercent());
Peter Kasting 2016/04/12 23:39:56 It feels wrong that we duplicate this logic both h
Tom (Use chromium acct) 2016/04/14 19:19:36 Done.
}
zoom_label_->SetText(
l10n_util::GetStringFUTF16Int(IDS_ZOOM_PERCENT, zoom));
« chrome/browser/ui/browser_commands.cc ('K') | « chrome/browser/ui/browser_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698