| 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 1883 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1894 browser_->extension_window_controller()->SetFullscreenMode(NO, GURL()); | 1894 browser_->extension_window_controller()->SetFullscreenMode(NO, GURL()); |
| 1895 return YES; | 1895 return YES; |
| 1896 } | 1896 } |
| 1897 return NO; | 1897 return NO; |
| 1898 } | 1898 } |
| 1899 | 1899 |
| 1900 - (void)setFullscreenToolbarVisible:(BOOL)visible { | 1900 - (void)setFullscreenToolbarVisible:(BOOL)visible { |
| 1901 if (shouldShowFullscreenToolbar_ == visible) | 1901 if (shouldShowFullscreenToolbar_ == visible) |
| 1902 return; | 1902 return; |
| 1903 | 1903 |
| 1904 [fullscreenToolbarController_ setToolbarFraction:0.0]; | |
| 1905 shouldShowFullscreenToolbar_ = visible; | 1904 shouldShowFullscreenToolbar_ = visible; |
| 1906 [self adjustUIForSlidingFullscreenStyle: | 1905 [self adjustUIForSlidingFullscreenStyle: |
| 1907 shouldShowFullscreenToolbar_ ? fullscreen_mac::OMNIBOX_TABS_PRESENT | 1906 shouldShowFullscreenToolbar_ ? fullscreen_mac::OMNIBOX_TABS_PRESENT |
| 1908 : fullscreen_mac::OMNIBOX_TABS_HIDDEN]; | 1907 : fullscreen_mac::OMNIBOX_TABS_HIDDEN]; |
| 1909 } | 1908 } |
| 1910 | 1909 |
| 1911 - (BOOL)isInAnyFullscreenMode { | 1910 - (BOOL)isInAnyFullscreenMode { |
| 1912 return [self isInImmersiveFullscreen] || [self isInAppKitFullscreen]; | 1911 return [self isInImmersiveFullscreen] || [self isInAppKitFullscreen]; |
| 1913 } | 1912 } |
| 1914 | 1913 |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2053 | 2052 |
| 2054 - (NSRect)savedRegularWindowFrame { | 2053 - (NSRect)savedRegularWindowFrame { |
| 2055 return savedRegularWindowFrame_; | 2054 return savedRegularWindowFrame_; |
| 2056 } | 2055 } |
| 2057 | 2056 |
| 2058 - (BOOL)isFullscreenTransitionInProgress { | 2057 - (BOOL)isFullscreenTransitionInProgress { |
| 2059 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; | 2058 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; |
| 2060 } | 2059 } |
| 2061 | 2060 |
| 2062 @end // @implementation BrowserWindowController(WindowType) | 2061 @end // @implementation BrowserWindowController(WindowType) |
| OLD | NEW |