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

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 1799 matching lines...) Expand 10 before | Expand all | Expand 10 after
1810 1810
1811 // (Needed for |BookmarkBarControllerDelegate| protocol.) 1811 // (Needed for |BookmarkBarControllerDelegate| protocol.)
1812 - (void)bookmarkBar:(BookmarkBarController*)controller 1812 - (void)bookmarkBar:(BookmarkBarController*)controller
1813 willAnimateFromState:(BookmarkBar::State)oldState 1813 willAnimateFromState:(BookmarkBar::State)oldState
1814 toState:(BookmarkBar::State)newState { 1814 toState:(BookmarkBar::State)newState {
1815 [toolbarController_ setDividerOpacity:[self toolbarDividerOpacity]]; 1815 [toolbarController_ setDividerOpacity:[self toolbarDividerOpacity]];
1816 [self adjustToolbarAndBookmarkBarForCompression: 1816 [self adjustToolbarAndBookmarkBarForCompression:
1817 [controller getDesiredToolbarHeightCompression]]; 1817 [controller getDesiredToolbarHeightCompression]];
1818 } 1818 }
1819 1819
1820 // (Needed for |BrowserWindowFullscreenTransitionDelegate| protocol.)
1821 - (void)finishedExitingFullscreen {
1822 if (appKitDidExitFullscreen_) {
1823 [self windowDidExitFullScreen:nil];
1824 appKitDidExitFullscreen_ = NO;
1825 }
1826 }
1827
1820 // (Private/TestingAPI) 1828 // (Private/TestingAPI)
1821 - (void)resetWindowGrowthState { 1829 - (void)resetWindowGrowthState {
1822 windowTopGrowth_ = 0; 1830 windowTopGrowth_ = 0;
1823 windowBottomGrowth_ = 0; 1831 windowBottomGrowth_ = 0;
1824 isShrinkingFromZoomed_ = NO; 1832 isShrinkingFromZoomed_ = NO;
1825 } 1833 }
1826 1834
1827 - (NSSize)overflowFrom:(NSRect)source 1835 - (NSSize)overflowFrom:(NSRect)source
1828 to:(NSRect)target { 1836 to:(NSRect)target {
1829 // If |source|'s boundary is outside of |target|'s, set its distance 1837 // If |source|'s boundary is outside of |target|'s, set its distance
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
2096 2104
2097 - (BOOL)supportsBookmarkBar { 2105 - (BOOL)supportsBookmarkBar {
2098 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; 2106 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
2099 } 2107 }
2100 2108
2101 - (BOOL)isTabbedWindow { 2109 - (BOOL)isTabbedWindow {
2102 return browser_->is_type_tabbed(); 2110 return browser_->is_type_tabbed();
2103 } 2111 }
2104 2112
2105 @end // @implementation BrowserWindowController(WindowType) 2113 @end // @implementation BrowserWindowController(WindowType)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698