Chromium Code Reviews| Index: chrome/browser/ui/browser_commands.cc |
| diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc |
| index 76c73ebf2732615c102e06616997d39516bce80f..b74f37d605f783ad69282a117d7ec97dd53fd76c 100644 |
| --- a/chrome/browser/ui/browser_commands.cc |
| +++ b/chrome/browser/ui/browser_commands.cc |
| @@ -50,6 +50,7 @@ |
| #include "chrome/browser/ui/status_bubble.h" |
| #include "chrome/browser/ui/tab_contents/core_tab_helper.h" |
| #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| +#include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h" |
| #include "chrome/browser/ui/zoom/zoom_controller.h" |
| #include "chrome/browser/upgrade_detector.h" |
| #include "chrome/common/chrome_switches.h" |
| @@ -608,9 +609,10 @@ bool CanZoomOut(content::WebContents* contents) { |
| contents->GetMinimumZoomPercent(); |
| } |
| -bool ActualSize(content::WebContents* contents) { |
| +bool ActualSize(content::WebContents* contents, Browser* browser) { |
| ZoomController* zoom_controller = ZoomController::FromWebContents(contents); |
| - return zoom_controller->GetZoomPercent() != 100.0f; |
| + return zoom_controller->GetZoomPercent() != |
| + zoom_controller->GetDefaultZoomPercent(); |
|
Alexei Svitkine (slow)
2014/10/28 13:15:54
Can't you use zoom_controller->IsAtDefaultZoom() i
|
| } |
| TabStripModelDelegate::RestoreTabType GetRestoreTabType( |