Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_controller.mm

Issue 523233002: mac: Remove simplified fullscreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@new_fullscreen2
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 2080 matching lines...) Expand 10 before | Expand all | Expand 10 after
2091 } else { 2091 } else {
2092 // Need to invoke AppKit Fullscreen API. Presentation mode will 2092 // Need to invoke AppKit Fullscreen API. Presentation mode will
2093 // automatically be enabled in |-windowWillEnterFullScreen:|. 2093 // automatically be enabled in |-windowWillEnterFullScreen:|.
2094 enteringPresentationMode_ = YES; 2094 enteringPresentationMode_ = YES;
2095 [self enterAppKitFullscreen]; 2095 [self enterAppKitFullscreen];
2096 } 2096 }
2097 } 2097 }
2098 2098
2099 - (void)enterHTML5FullscreenForURL:(const GURL&)url 2099 - (void)enterHTML5FullscreenForURL:(const GURL&)url
2100 bubbleType:(FullscreenExitBubbleType)bubbleType { 2100 bubbleType:(FullscreenExitBubbleType)bubbleType {
2101 const CommandLine* command_line = CommandLine::ForCurrentProcess(); 2101 if (!chrome::mac::SupportsSystemFullscreen()) {
2102 if (command_line->HasSwitch(switches::kEnableSimplifiedFullscreen) ||
2103 !chrome::mac::SupportsSystemFullscreen()) {
2104 [self enterImmersiveFullscreen]; 2102 [self enterImmersiveFullscreen];
2105 if (!url.is_empty()) 2103 if (!url.is_empty())
2106 [self updateFullscreenExitBubbleURL:url bubbleType:bubbleType]; 2104 [self updateFullscreenExitBubbleURL:url bubbleType:bubbleType];
2107 } else { 2105 } else {
2108 [self enterPresentationModeForURL:url bubbleType:bubbleType]; 2106 [self enterPresentationModeForURL:url bubbleType:bubbleType];
2109 } 2107 }
2110 } 2108 }
2111 2109
2112 - (void)exitAnyFullscreen { 2110 - (void)exitAnyFullscreen {
2113 // TODO(erikchen): Fullscreen modes should stack. Should be able to exit 2111 // TODO(erikchen): Fullscreen modes should stack. Should be able to exit
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
2207 2205
2208 - (BOOL)supportsBookmarkBar { 2206 - (BOOL)supportsBookmarkBar {
2209 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; 2207 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
2210 } 2208 }
2211 2209
2212 - (BOOL)isTabbedWindow { 2210 - (BOOL)isTabbedWindow {
2213 return browser_->is_type_tabbed(); 2211 return browser_->is_type_tabbed();
2214 } 2212 }
2215 2213
2216 @end // @implementation BrowserWindowController(WindowType) 2214 @end // @implementation BrowserWindowController(WindowType)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698