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

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

Issue 9702055: Automated tests for full screen & mouse lock M16 features (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Valgrind error fix, merge to 130358 Created 8 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
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller.mm ('k') | chrome/browser/ui/fullscreen_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1c74e9b04e1a380da7a1d81922f753131bea768f..75362f94f1402faaed78a7cbb78bf07d25771ad2 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -676,7 +676,7 @@ willPositionSheet:(NSWindow*)sheet
return;
if (presentationMode) {
- BOOL fullscreen_for_tab = browser_->IsFullscreenForTab();
+ BOOL fullscreen_for_tab = browser_->IsFullscreenForTabOrPending();
BOOL showDropdown = !fullscreen_for_tab &&
(forceDropdown || [self floatingBarHasFocus]);
NSView* contentView = [[self window] contentView];
@@ -789,7 +789,7 @@ willPositionSheet:(NSWindow*)sheet
}
- (void)showFullscreenExitBubbleIfNecessary {
- if (!browser_->IsFullscreenForTab()) {
+ if (!browser_->IsFullscreenForTabOrPending()) {
return;
}
@@ -851,7 +851,7 @@ willPositionSheet:(NSWindow*)sheet
NSWindow* window = [self window];
savedRegularWindowFrame_ = [window frame];
BOOL mode = [self shouldUsePresentationModeWhenEnteringFullscreen];
- mode = mode || browser_->IsFullscreenForTab();
+ mode = mode || browser_->IsFullscreenForTabOrPending();
enteringFullscreen_ = YES;
[self setPresentationModeInternal:mode forceDropdown:NO];
}
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller.mm ('k') | chrome/browser/ui/fullscreen_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698