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

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: indent Created 8 years, 7 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 dedd849515b079ffec7d9e6072ddb27e6d290af8..347ce9583ddae9290489ff66e23a9f4f0df829e3 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -791,23 +791,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];
}
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller.mm ('k') | chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698