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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/browser_window_controller.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
« chrome/browser/ui/browser_browsertest.cc ('K') | « chrome/browser/ui/browser_browsertest.cc ('k') | chrome/browser/ui/cocoa/browser_window_controller_private.mm » ('j') | chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/browser_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index ec6fd54e6135e2637e58c7f72f51cdf95bfa0d0e..0810200820b084622324ae93fd8b7e303c936b96 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -1980,7 +1980,16 @@ willAnimateFromState:(bookmarks::VisualState)oldState
- (void)updateFullscreenExitBubbleURL:(const GURL&)url
bubbleType:(FullscreenExitBubbleType)bubbleType {
- [fullscreenExitBubbleController_.get() updateURL:url bubbleType:bubbleType];
+ fullscreenUrl_ = url;
+ fullscreenBubbleType_ = bubbleType;
+ if (bubbleType == FEB_TYPE_NONE) {
+ [self destroyFullscreenExitBubbleIfNecessary];
+ } else {
+ if (!fullscreenExitBubbleController_.get()) {
+ [self showFullscreenExitBubbleIfNecessary];
+ }
+ [fullscreenExitBubbleController_.get() updateURL:url bubbleType:bubbleType];
+ }
}
- (BOOL)isFullscreen {
« chrome/browser/ui/browser_browsertest.cc ('K') | « chrome/browser/ui/browser_browsertest.cc ('k') | chrome/browser/ui/cocoa/browser_window_controller_private.mm » ('j') | chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698