| 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 cffc7903dba949c70785bf87e4f1da21218f1e2f..159c1e322af43bdbc75d81f5bef4951004d91528 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
|
| @@ -1978,7 +1978,10 @@ willAnimateFromState:(BookmarkBar::State)oldState
|
| }
|
|
|
| - (BOOL)hasToolbar {
|
| - return [self supportsWindowFeature:Browser::FEATURE_TOOLBAR];
|
| + FullscreenToolbarLayout layout =
|
| + [[self fullscreenToolbarController] computeLayout];
|
| + return layout.toolbarStyle != FullscreenToolbarStyle::TOOLBAR_NONE &&
|
| + [self supportsWindowFeature:Browser::FEATURE_TOOLBAR];
|
| }
|
|
|
| - (BOOL)hasLocationBar {
|
|
|