| Index: chrome/browser/ui/cocoa/browser_window_cocoa.mm
|
| diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
|
| index 95c39c30ce808bbacb319cffb55ad556d2e13b20..160eb6b9a22f6e3714ee9c3b9fef47cf4bd9162f 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
|
| @@ -363,7 +363,10 @@ gfx::Rect BrowserWindowCocoa::GetBounds() const {
|
| }
|
|
|
| bool BrowserWindowCocoa::IsMaximized() const {
|
| - return [window() isZoomed];
|
| + // -isZoomed returns YES if the window's frame equals the rect returned by
|
| + // -windowWillUseStandardFrame:defaultFrame:, even if the window is in the
|
| + // dock, so have to explicitly check for miniaturization state first.
|
| + return ![window() isMiniaturized] && [window() isZoomed];
|
| }
|
|
|
| bool BrowserWindowCocoa::IsMinimized() const {
|
|
|