| OLD | NEW |
| 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 1806 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1817 | 1817 |
| 1818 @implementation BrowserWindowController(Fullscreen) | 1818 @implementation BrowserWindowController(Fullscreen) |
| 1819 | 1819 |
| 1820 - (void)enterBrowserFullscreen { | 1820 - (void)enterBrowserFullscreen { |
| 1821 [self enterAppKitFullscreen]; | 1821 [self enterAppKitFullscreen]; |
| 1822 } | 1822 } |
| 1823 | 1823 |
| 1824 - (void)updateUIForTabFullscreen: | 1824 - (void)updateUIForTabFullscreen: |
| 1825 (ExclusiveAccessContext::TabFullscreenState)state { | 1825 (ExclusiveAccessContext::TabFullscreenState)state { |
| 1826 DCHECK([self isInAnyFullscreenMode]); | 1826 DCHECK([self isInAnyFullscreenMode]); |
| 1827 [fullscreenToolbarController_ updateToolbarStyle]; | 1827 [fullscreenToolbarController_ |
| 1828 updateToolbarStyleExitingTabFullscreen: |
| 1829 state == ExclusiveAccessContext::STATE_EXIT_TAB_FULLSCREEN]; |
| 1828 } | 1830 } |
| 1829 | 1831 |
| 1830 - (void)updateFullscreenExitBubble { | 1832 - (void)updateFullscreenExitBubble { |
| 1831 [self showFullscreenExitBubbleIfNecessary]; | 1833 [self showFullscreenExitBubbleIfNecessary]; |
| 1832 } | 1834 } |
| 1833 | 1835 |
| 1834 - (BOOL)exitExtensionFullscreenIfPossible { | 1836 - (BOOL)exitExtensionFullscreenIfPossible { |
| 1835 if (browser_->exclusive_access_manager() | 1837 if (browser_->exclusive_access_manager() |
| 1836 ->fullscreen_controller() | 1838 ->fullscreen_controller() |
| 1837 ->IsExtensionFullscreenOrPending()) { | 1839 ->IsExtensionFullscreenOrPending()) { |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1976 | 1978 |
| 1977 - (NSRect)savedRegularWindowFrame { | 1979 - (NSRect)savedRegularWindowFrame { |
| 1978 return savedRegularWindowFrame_; | 1980 return savedRegularWindowFrame_; |
| 1979 } | 1981 } |
| 1980 | 1982 |
| 1981 - (BOOL)isFullscreenTransitionInProgress { | 1983 - (BOOL)isFullscreenTransitionInProgress { |
| 1982 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; | 1984 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; |
| 1983 } | 1985 } |
| 1984 | 1986 |
| 1985 @end // @implementation BrowserWindowController(WindowType) | 1987 @end // @implementation BrowserWindowController(WindowType) |
| OLD | NEW |