Chromium Code Reviews| 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 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 1948 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1959 [self enterBrowserFullscreenWithToolbar:NO]; | 1959 [self enterBrowserFullscreenWithToolbar:NO]; |
| 1960 } else { | 1960 } else { |
| 1961 [self enterImmersiveFullscreen]; | 1961 [self enterImmersiveFullscreen]; |
| 1962 DCHECK(!url.is_empty()); | 1962 DCHECK(!url.is_empty()); |
| 1963 [self updateFullscreenExitBubbleURL:url bubbleType:bubbleType]; | 1963 [self updateFullscreenExitBubbleURL:url bubbleType:bubbleType]; |
| 1964 } | 1964 } |
| 1965 } | 1965 } |
| 1966 | 1966 |
| 1967 - (void)enterWebContentFullscreenForURL:(const GURL&)url | 1967 - (void)enterWebContentFullscreenForURL:(const GURL&)url |
| 1968 bubbleType:(ExclusiveAccessBubbleType)bubbleType { | 1968 bubbleType:(ExclusiveAccessBubbleType)bubbleType { |
| 1969 [self enterImmersiveFullscreen]; | 1969 if (chrome::mac::SupportsSystemFullscreen() && base::mac::IsOSLionOrLater()) |
| 1970 [self exitAppKitFullscreen]; | |
|
erikchen
2015/10/07 21:51:03
I'm confused - should this be enterAppKitFullscree
spqchan
2015/10/07 22:54:01
Whoops, yes this should be enterAppKitFullscreen
erikchen
2015/10/07 23:17:53
adjustUIForEnteringFullscreen relies on enteringPr
spqchan
2015/10/07 23:53:26
In adjustUIForEnteringFullscreen, we check if the
| |
| 1971 else | |
| 1972 [self enterImmersiveFullscreen]; | |
| 1973 | |
| 1970 if (!url.is_empty()) | 1974 if (!url.is_empty()) |
| 1971 [self updateFullscreenExitBubbleURL:url bubbleType:bubbleType]; | 1975 [self updateFullscreenExitBubbleURL:url bubbleType:bubbleType]; |
| 1972 } | 1976 } |
| 1973 | 1977 |
| 1974 - (void)exitAnyFullscreen { | 1978 - (void)exitAnyFullscreen { |
| 1975 // TODO(erikchen): Fullscreen modes should stack. Should be able to exit | 1979 // TODO(erikchen): Fullscreen modes should stack. Should be able to exit |
| 1976 // Immersive Fullscreen and still be in AppKit Fullscreen. | 1980 // Immersive Fullscreen and still be in AppKit Fullscreen. |
| 1977 if ([self isInAppKitFullscreen]) | 1981 if ([self isInAppKitFullscreen]) |
| 1978 [self exitAppKitFullscreen]; | 1982 [self exitAppKitFullscreen]; |
| 1979 if ([self isInImmersiveFullscreen]) | 1983 if ([self isInImmersiveFullscreen]) |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2061 | 2065 |
| 2062 - (BOOL)supportsBookmarkBar { | 2066 - (BOOL)supportsBookmarkBar { |
| 2063 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; | 2067 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; |
| 2064 } | 2068 } |
| 2065 | 2069 |
| 2066 - (BOOL)isTabbedWindow { | 2070 - (BOOL)isTabbedWindow { |
| 2067 return browser_->is_type_tabbed(); | 2071 return browser_->is_type_tabbed(); |
| 2068 } | 2072 } |
| 2069 | 2073 |
| 2070 @end // @implementation BrowserWindowController(WindowType) | 2074 @end // @implementation BrowserWindowController(WindowType) |
| OLD | NEW |