Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(851)

Unified Diff: chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm

Issue 10573003: Simplify fullscreen exit bubble on mac; updating always creates one freshly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698