| 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 1868 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1879 return; | 1879 return; |
| 1880 } | 1880 } |
| 1881 | 1881 |
| 1882 [self adjustUIForSlidingFullscreenStyle: | 1882 [self adjustUIForSlidingFullscreenStyle: |
| 1883 shouldShowFullscreenToolbar_ | 1883 shouldShowFullscreenToolbar_ |
| 1884 ? FullscreenSlidingStyle::OMNIBOX_TABS_PRESENT | 1884 ? FullscreenSlidingStyle::OMNIBOX_TABS_PRESENT |
| 1885 : FullscreenSlidingStyle::OMNIBOX_TABS_HIDDEN]; | 1885 : FullscreenSlidingStyle::OMNIBOX_TABS_HIDDEN]; |
| 1886 } | 1886 } |
| 1887 | 1887 |
| 1888 - (void)updateFullscreenExitBubble { | 1888 - (void)updateFullscreenExitBubble { |
| 1889 [self layoutSubviews]; | |
| 1890 [self showFullscreenExitBubbleIfNecessary]; | 1889 [self showFullscreenExitBubbleIfNecessary]; |
| 1891 } | 1890 } |
| 1892 | 1891 |
| 1893 - (BOOL)exitExtensionFullscreenIfPossible { | 1892 - (BOOL)exitExtensionFullscreenIfPossible { |
| 1894 if (browser_->exclusive_access_manager() | 1893 if (browser_->exclusive_access_manager() |
| 1895 ->fullscreen_controller() | 1894 ->fullscreen_controller() |
| 1896 ->IsExtensionFullscreenOrPending()) { | 1895 ->IsExtensionFullscreenOrPending()) { |
| 1897 browser_->extension_window_controller()->SetFullscreenMode(NO, GURL()); | 1896 browser_->extension_window_controller()->SetFullscreenMode(NO, GURL()); |
| 1898 return YES; | 1897 return YES; |
| 1899 } | 1898 } |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2050 | 2049 |
| 2051 - (NSRect)savedRegularWindowFrame { | 2050 - (NSRect)savedRegularWindowFrame { |
| 2052 return savedRegularWindowFrame_; | 2051 return savedRegularWindowFrame_; |
| 2053 } | 2052 } |
| 2054 | 2053 |
| 2055 - (BOOL)isFullscreenTransitionInProgress { | 2054 - (BOOL)isFullscreenTransitionInProgress { |
| 2056 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; | 2055 return enteringAppKitFullscreen_ || exitingAppKitFullscreen_; |
| 2057 } | 2056 } |
| 2058 | 2057 |
| 2059 @end // @implementation BrowserWindowController(WindowType) | 2058 @end // @implementation BrowserWindowController(WindowType) |
| OLD | NEW |