Chromium Code Reviews| Index: chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm |
| diff --git a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm |
| index c5908f88696bdfe87b121ef9525069e863390452..9027519aadfeb0a17ee92ec032987ba774b13351 100644 |
| --- a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm |
| +++ b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm |
| @@ -91,8 +91,6 @@ const float kHideDuration = 0.7; |
| DCHECK(fullscreen_bubble::ShowButtonsForType(bubbleType_)); |
| browser_->OnAcceptFullscreenPermission( |
| url_, bubbleType_); |
| - [self showButtons:NO]; |
| - [self hideSoon]; |
|
Nico
2012/06/20 15:52:11
Why is this no longer necessary? (This is the bubb
scheib
2012/06/20 16:20:34
OnAcceptFullscreenPermission destroys this object.
Nico
2012/06/20 16:23:36
Right, but it could reuse the view. That way it's
scheib
2012/06/20 16:29:12
The previous behavior:
- Bubble appears with butto
|
| } |
| - (void)deny:(id)sender { |
| @@ -143,36 +141,6 @@ const float kHideDuration = 0.7; |
| [[self window] setFrameOrigin:origin]; |
| } |
| -- (void)updateURL:(const GURL&)url |
| - bubbleType:(FullscreenExitBubbleType)bubbleType { |
| - bubbleType_ = bubbleType; |
| - |
| - [messageLabel_ setStringValue:[self getLabelText]]; |
| - |
| - // Make sure the bubble is visible. |
| - [hideAnimation_.get() stopAnimation]; |
| - [hideTimer_ invalidate]; |
| - [[[self window] animator] setAlphaValue:1.0]; |
| - |
| - if (fullscreen_bubble::ShowButtonsForType(bubbleType)) { |
| - [denyButton_ setTitle:SysUTF16ToNSString( |
| - fullscreen_bubble::GetDenyButtonTextForType(bubbleType))]; |
| - [self showButtons:YES]; |
| - |
| - // Reenable mouse events if they were disabled previously. |
| - [[self window] setIgnoresMouseEvents:NO]; |
| - } else { |
| - [self showButtons:NO]; |
| - // Only button-less bubbles auto-hide. |
| - [self hideSoon]; |
| - } |
| - // TODO(jeremya): show "Press Esc to exit" instead of a link on mouselock. |
| - |
| - // Relayout. A bit jumpy, but functional. |
| - [tweaker_ tweakUI:[self window]]; |
| - [owner_ layoutSubviews]; |
| -} |
| - |
| // Called when someone clicks on the embedded link. |
| - (BOOL) textView:(NSTextView*)textView |
| clickedOnLink:(id)link |