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

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

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 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 2000 matching lines...) Expand 10 before | Expand all | Expand 10 after
2011 return presentationModeController_.get() && 2011 return presentationModeController_.get() &&
2012 [presentationModeController_ inPresentationMode] && 2012 [presentationModeController_ inPresentationMode] &&
2013 presentationModeController_.get().slidingStyle == 2013 presentationModeController_.get().slidingStyle ==
2014 fullscreen_mac::OMNIBOX_TABS_HIDDEN; 2014 fullscreen_mac::OMNIBOX_TABS_HIDDEN;
2015 } 2015 }
2016 2016
2017 - (BOOL)shouldShowFullscreenToolbar { 2017 - (BOOL)shouldShowFullscreenToolbar {
2018 return shouldShowFullscreenToolbar_; 2018 return shouldShowFullscreenToolbar_;
2019 } 2019 }
2020 2020
2021 - (void)exitFullscreenAnimationFinished {
2022 if (appKitDidExitFullscreen_) {
2023 [self windowDidExitFullScreen:nil];
2024 appKitDidExitFullscreen_ = NO;
2025 }
2026 }
2027
2021 - (void)resizeFullscreenWindow { 2028 - (void)resizeFullscreenWindow {
2022 DCHECK([self isInAnyFullscreenMode]); 2029 DCHECK([self isInAnyFullscreenMode]);
2023 if (![self isInAnyFullscreenMode]) 2030 if (![self isInAnyFullscreenMode])
2024 return; 2031 return;
2025 2032
2026 NSWindow* window = [self window]; 2033 NSWindow* window = [self window];
2027 [window setFrame:[[window screen] frame] display:YES]; 2034 [window setFrame:[[window screen] frame] display:YES];
2028 [self layoutSubviews]; 2035 [self layoutSubviews];
2029 } 2036 }
2030 2037
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
2095 } 2102 }
2096 2103
2097 - (BOOL)supportsBookmarkBar { 2104 - (BOOL)supportsBookmarkBar {
2098 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; 2105 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
2099 } 2106 }
2100 2107
2101 - (BOOL)isTabbedWindow { 2108 - (BOOL)isTabbedWindow {
2102 return browser_->is_type_tabbed(); 2109 return browser_->is_type_tabbed();
2103 } 2110 }
2104 2111
2112 - (NSRect)savedRegularWindowFrame {
2113 return savedRegularWindowFrame_;
2114 }
2115
2105 @end // @implementation BrowserWindowController(WindowType) 2116 @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