| 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 1851 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1862 } | 1862 } |
| 1863 | 1863 |
| 1864 return touchBar_.get(); | 1864 return touchBar_.get(); |
| 1865 } | 1865 } |
| 1866 | 1866 |
| 1867 - (void)invalidateTouchBar { | 1867 - (void)invalidateTouchBar { |
| 1868 if ([[self window] respondsToSelector:@selector(setTouchBar:)]) | 1868 if ([[self window] respondsToSelector:@selector(setTouchBar:)]) |
| 1869 [[self window] performSelector:@selector(setTouchBar:) withObject:nil]; | 1869 [[self window] performSelector:@selector(setTouchBar:) withObject:nil]; |
| 1870 } | 1870 } |
| 1871 | 1871 |
| 1872 - (BOOL)isToolbarShowing { |
| 1873 return [fullscreenToolbarController_ mustShowFullscreenToolbar]; |
| 1874 } |
| 1875 |
| 1872 @end // @implementation BrowserWindowController | 1876 @end // @implementation BrowserWindowController |
| 1873 | 1877 |
| 1874 @implementation BrowserWindowController(Fullscreen) | 1878 @implementation BrowserWindowController(Fullscreen) |
| 1875 | 1879 |
| 1876 - (void)enterBrowserFullscreen { | 1880 - (void)enterBrowserFullscreen { |
| 1877 [self enterAppKitFullscreen]; | 1881 [self enterAppKitFullscreen]; |
| 1878 } | 1882 } |
| 1879 | 1883 |
| 1880 - (void)updateUIForTabFullscreen: | 1884 - (void)updateUIForTabFullscreen: |
| 1881 (ExclusiveAccessContext::TabFullscreenState)state { | 1885 (ExclusiveAccessContext::TabFullscreenState)state { |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2033 | 2037 |
| 2034 - (NSRect)savedRegularWindowFrame { | 2038 - (NSRect)savedRegularWindowFrame { |
| 2035 return savedRegularWindowFrame_; | 2039 return savedRegularWindowFrame_; |
| 2036 } | 2040 } |
| 2037 | 2041 |
| 2038 - (BOOL)isFullscreenTransitionInProgress { | 2042 - (BOOL)isFullscreenTransitionInProgress { |
| 2039 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; | 2043 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; |
| 2040 } | 2044 } |
| 2041 | 2045 |
| 2042 @end // @implementation BrowserWindowController(WindowType) | 2046 @end // @implementation BrowserWindowController(WindowType) |
| OLD | NEW |