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

Unified Diff: chrome/browser/ui/cocoa/browser_window_controller.h

Issue 1813693003: Fixed a fullscreen race condition on OSX (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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.h
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.h b/chrome/browser/ui/cocoa/browser_window_controller.h
index e305c5eb16c81fddb0955094780cdb3262d594cc..c5e3fe9b1b537e59d8079a3b6864cec472818190 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.h
+++ b/chrome/browser/ui/cocoa/browser_window_controller.h
@@ -18,6 +18,7 @@
#include "chrome/browser/translate/chrome_translate_client.h"
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h"
+#import "chrome/browser/ui/cocoa/browser_window_fullscreen_transition.h"
#import "chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.h"
#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
#import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"
@@ -65,7 +66,8 @@ class Command;
@interface BrowserWindowController
: TabWindowController<BookmarkBarControllerDelegate,
ViewResizer,
- TabStripControllerDelegate> {
+ TabStripControllerDelegate,
+ BrowserWindowFullscreenTransitionDelegate> {
@private
// The ordering of these members is important as it determines the order in
// which they are destroyed. |browser_| needs to be destroyed last as most of
@@ -164,6 +166,11 @@ class Command;
// True if the toolbar needs to be shown in fullscreen.
BOOL shouldShowFullscreenToolbar_;
+ // True if AppKit has finished exiting fullscreen before the exit animation
+ // is completed. This flag is used to ensure that |windowDidExitFullscreen|
+ // is called after the exit fullscreen animation is complete.
+ BOOL appKitDidExitFullscreen_;
+
// The size of the original (non-fullscreen) window. This is saved just
// before entering fullscreen mode and is only valid when |-isFullscreen|
// returns YES.

Powered by Google App Engine
This is Rietveld 408576698