| Index: chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| index 700739e711e5f3cb4693ec7f7dc1b77bafe0c869..664ca9550b0745404668322066b197e43ed47eef 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| @@ -793,7 +793,6 @@ willPositionSheet:(NSWindow*)sheet
|
| // Force the bookmark bar z-order to update.
|
| [[bookmarkBarController_ view] removeFromSuperview];
|
| [self updateSubviewZOrder:fullscreen];
|
| - [self updateAllowOverlappingViews:fullscreen];
|
| }
|
|
|
| - (void)showFullscreenExitBubbleIfNecessary {
|
| @@ -1031,40 +1030,6 @@ willPositionSheet:(NSWindow*)sheet
|
| }
|
| }
|
|
|
| -- (BOOL)shouldAllowOverlappingViews:(BOOL)inPresentationMode {
|
| - if (inPresentationMode)
|
| - return YES;
|
| -
|
| - if (findBarCocoaController_ &&
|
| - ![[findBarCocoaController_ findBarView] isHidden]) {
|
| - return YES;
|
| - }
|
| -
|
| - if (overlappedViewCount_)
|
| - return YES;
|
| -
|
| - return NO;
|
| -}
|
| -
|
| -- (void)updateAllowOverlappingViews:(BOOL)inPresentationMode {
|
| - WebContents* contents = browser_->tab_strip_model()->GetActiveWebContents();
|
| - if (!contents)
|
| - return;
|
| -
|
| - BOOL allowOverlappingViews =
|
| - [self shouldAllowOverlappingViews:inPresentationMode];
|
| -
|
| - // The rendering path with overlapping views disabled causes bugs when
|
| - // transitioning between composited and non-composited mode.
|
| - // http://crbug.com/279472
|
| - allowOverlappingViews = YES;
|
| - contents->SetAllowOverlappingViews(allowOverlappingViews);
|
| -
|
| - WebContents* devTools = DevToolsWindow::GetInTabWebContents(contents, NULL);
|
| - if (devTools)
|
| - devTools->SetAllowOverlappingViews(allowOverlappingViews);
|
| -}
|
| -
|
| - (void)updateInfoBarTipVisibility {
|
| // If there's no toolbar then hide the infobar tip.
|
| [infoBarContainerController_
|
|
|