Chromium Code Reviews| Index: chrome/browser/ui/cocoa/browser_window_controller.mm |
| diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm |
| index 4be4668efd342e41070120ca9a5e8290959681db..cc865cf528988b52b093c6f2917f5f3676ac870b 100644 |
| --- a/chrome/browser/ui/cocoa/browser_window_controller.mm |
| +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm |
| @@ -1950,6 +1950,7 @@ using content::WebContents; |
| // and |layoutSubviews| computes the FindBar's position. |
| // TODO: calling |layoutSubviews| here is a waste, find a better way to |
| // do this. |
| + |
|
erikchen
2015/08/11 22:42:54
why did you add whitespace here?
spqchan1
2015/08/12 19:34:41
Done.
|
| if ([findBarCocoaController_ isFindBarVisible]) |
| [self layoutSubviews]; |
| } |
| @@ -2151,9 +2152,10 @@ willAnimateFromState:(BookmarkBar::State)oldState |
| } |
| - (BOOL)isInAppKitFullscreen { |
| - return ([[self window] styleMask] & NSFullScreenWindowMask) == |
| - NSFullScreenWindowMask || |
| - enteringAppKitFullscreen_; |
| + return !exitingAppKitFullscreen_ && |
| + (([[self window] styleMask] & NSFullScreenWindowMask) == |
| + NSFullScreenWindowMask || |
| + enteringAppKitFullscreen_); |
| } |
| - (void)enterExtensionFullscreenForURL:(const GURL&)url |