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

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

Issue 10261011: Windowed mode mouse lock addded to fullscreen controller. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: yzshen feedback addressed. Created 8 years, 8 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
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 75362f94f1402faaed78a7cbb78bf07d25771ad2..9835cf3561501c7db711f9e9d49243b0bd090bd8 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -789,23 +789,15 @@ willPositionSheet:(NSWindow*)sheet
}
- (void)showFullscreenExitBubbleIfNecessary {
- if (!browser_->IsFullscreenForTabOrPending()) {
- return;
- }
-
[presentationModeController_ ensureOverlayHiddenWithAnimation:NO delay:NO];
+ [fullscreenExitBubbleController_ closeImmediately];
fullscreenExitBubbleController_.reset(
[[FullscreenExitBubbleController alloc]
initWithOwner:self
browser:browser_.get()
url:fullscreenUrl_
bubbleType:fullscreenBubbleType_]);
- NSView* contentView = [[self window] contentView];
- CGFloat maxWidth = NSWidth([contentView frame]);
- CGFloat maxY = NSMaxY([[[self window] contentView] frame]);
- [fullscreenExitBubbleController_
- positionInWindowAtTop:maxY width:maxWidth];
[fullscreenExitBubbleController_ showWindow];
}

Powered by Google App Engine
This is Rietveld 408576698