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

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_controller.mm

Issue 1876313002: Fixed a fullscreen race condition on OSX (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661
Patch Set: Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 5 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <numeric> 8 #include <numeric>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 2047 matching lines...) Expand 10 before | Expand all | Expand 10 after
2058 return presentationModeController_.get() && 2058 return presentationModeController_.get() &&
2059 [presentationModeController_ inPresentationMode] && 2059 [presentationModeController_ inPresentationMode] &&
2060 presentationModeController_.get().slidingStyle == 2060 presentationModeController_.get().slidingStyle ==
2061 fullscreen_mac::OMNIBOX_TABS_HIDDEN; 2061 fullscreen_mac::OMNIBOX_TABS_HIDDEN;
2062 } 2062 }
2063 2063
2064 - (BOOL)shouldHideFullscreenToolbar { 2064 - (BOOL)shouldHideFullscreenToolbar {
2065 return shouldHideFullscreenToolbar_; 2065 return shouldHideFullscreenToolbar_;
2066 } 2066 }
2067 2067
2068 - (void)exitFullscreenAnimationFinished {
2069 if (appKitDidExitFullscreen_) {
2070 [self windowDidExitFullScreen:nil];
2071 appKitDidExitFullscreen_ = NO;
2072 }
2073 }
2074
2068 - (void)resizeFullscreenWindow { 2075 - (void)resizeFullscreenWindow {
2069 DCHECK([self isInAnyFullscreenMode]); 2076 DCHECK([self isInAnyFullscreenMode]);
2070 if (![self isInAnyFullscreenMode]) 2077 if (![self isInAnyFullscreenMode])
2071 return; 2078 return;
2072 2079
2073 NSWindow* window = [self window]; 2080 NSWindow* window = [self window];
2074 [window setFrame:[[window screen] frame] display:YES]; 2081 [window setFrame:[[window screen] frame] display:YES];
2075 [self layoutSubviews]; 2082 [self layoutSubviews];
2076 } 2083 }
2077 2084
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
2142 } 2149 }
2143 2150
2144 - (BOOL)supportsBookmarkBar { 2151 - (BOOL)supportsBookmarkBar {
2145 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; 2152 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
2146 } 2153 }
2147 2154
2148 - (BOOL)isTabbedWindow { 2155 - (BOOL)isTabbedWindow {
2149 return browser_->is_type_tabbed(); 2156 return browser_->is_type_tabbed();
2150 } 2157 }
2151 2158
2159 - (NSRect)savedRegularWindowFrame {
2160 return savedRegularWindowFrame_;
2161 }
2162
2152 @end // @implementation BrowserWindowController(WindowType) 2163 @end // @implementation BrowserWindowController(WindowType)
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller.h ('k') | chrome/browser/ui/cocoa/browser_window_controller_private.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698