| 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 1eb48d44a24d85ea8988f049dd873efd4259e488..bb3abfdfbf8acbef7833d8cfc043f48a5f7bfdf8 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| @@ -447,16 +447,6 @@ - (void)moveViewsForImmersiveFullscreen:(BOOL)fullscreen
|
| [self enableBarVisibilityUpdates];
|
| }
|
|
|
| -- (void)permissionBubbleWindowWillClose:(NSNotification*)notification {
|
| - NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
|
| - [center removeObserver:self
|
| - name:NSWindowWillCloseNotification
|
| - object:[notification object]];
|
| - [self releaseBarVisibilityForOwner:[notification object]
|
| - withAnimation:YES
|
| - delay:YES];
|
| -}
|
| -
|
| - (void)updatePermissionBubbleAnchor {
|
| PermissionRequestManager* manager = [self permissionRequestManager];
|
| if (manager)
|
| @@ -470,23 +460,6 @@ - (void)configureFullscreenToolbarController {
|
| BOOL showDropdown =
|
| !fullscreenForTab && !kioskMode && ([self floatingBarHasFocus]);
|
|
|
| - PermissionRequestManager* manager = [self permissionRequestManager];
|
| - if (manager && manager->IsBubbleVisible()) {
|
| - NSWindow* bubbleWindow = manager->GetBubbleWindow();
|
| - DCHECK(bubbleWindow);
|
| - // A visible permission bubble will force the dropdown to remain
|
| - // visible.
|
| - [self lockBarVisibilityForOwner:bubbleWindow withAnimation:NO delay:NO];
|
| - showDropdown = YES;
|
| - // Register to be notified when the permission bubble is closed, to
|
| - // allow fullscreen to hide the dropdown.
|
| - NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
|
| - [center addObserver:self
|
| - selector:@selector(permissionBubbleWindowWillClose:)
|
| - name:NSWindowWillCloseNotification
|
| - object:bubbleWindow];
|
| - }
|
| -
|
| NSView* contentView = [[self window] contentView];
|
| [fullscreenToolbarController_
|
| setupFullscreenToolbarForContentView:contentView
|
|
|