| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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_private.h" | 5 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" |
| 6 | 6 |
| 7 #include <cmath> | 7 #include <cmath> |
| 8 | 8 |
| 9 #import "base/auto_reset.h" | 9 #import "base/auto_reset.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 816 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 827 | 827 |
| 828 - (void)adjustUIForExitingFullscreen { | 828 - (void)adjustUIForExitingFullscreen { |
| 829 exclusiveAccessController_->Destroy(); | 829 exclusiveAccessController_->Destroy(); |
| 830 [self adjustUIForExitingFullscreenAndStopOmniboxSliding]; | 830 [self adjustUIForExitingFullscreenAndStopOmniboxSliding]; |
| 831 } | 831 } |
| 832 | 832 |
| 833 - (void)adjustUIForEnteringFullscreen { | 833 - (void)adjustUIForEnteringFullscreen { |
| 834 fullscreen_mac::SlidingStyle style; | 834 fullscreen_mac::SlidingStyle style; |
| 835 if ([self isFullscreenForTabContent]) { | 835 if ([self isFullscreenForTabContent]) { |
| 836 style = fullscreen_mac::OMNIBOX_TABS_NONE; | 836 style = fullscreen_mac::OMNIBOX_TABS_NONE; |
| 837 } else if (enteringPresentationMode_ || [self shouldHideFullscreenToolbar]) { | 837 } else if (enteringPresentationMode_ || ![self shouldShowFullscreenToolbar]) { |
| 838 style = fullscreen_mac::OMNIBOX_TABS_HIDDEN; | 838 style = fullscreen_mac::OMNIBOX_TABS_HIDDEN; |
| 839 } else { | 839 } else { |
| 840 style = fullscreen_mac::OMNIBOX_TABS_PRESENT; | 840 style = fullscreen_mac::OMNIBOX_TABS_PRESENT; |
| 841 } | 841 } |
| 842 | 842 |
| 843 [self adjustUIForSlidingFullscreenStyle:style]; | 843 [self adjustUIForSlidingFullscreenStyle:style]; |
| 844 } | 844 } |
| 845 | 845 |
| 846 - (void)enableBarVisibilityUpdates { | 846 - (void)enableBarVisibilityUpdates { |
| 847 // Early escape if there's nothing to do. | 847 // Early escape if there's nothing to do. |
| (...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1239 return nil; | 1239 return nil; |
| 1240 } | 1240 } |
| 1241 | 1241 |
| 1242 - (BOOL)isFullscreenForTabContent { | 1242 - (BOOL)isFullscreenForTabContent { |
| 1243 return browser_->exclusive_access_manager() | 1243 return browser_->exclusive_access_manager() |
| 1244 ->fullscreen_controller() | 1244 ->fullscreen_controller() |
| 1245 ->IsWindowFullscreenForTabOrPending(); | 1245 ->IsWindowFullscreenForTabOrPending(); |
| 1246 } | 1246 } |
| 1247 | 1247 |
| 1248 @end // @implementation BrowserWindowController(Private) | 1248 @end // @implementation BrowserWindowController(Private) |
| OLD | NEW |