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

Unified Diff: chrome/browser/ui/cocoa/browser_window_cocoa.mm

Issue 523233002: mac: Remove simplified fullscreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@new_fullscreen2
Patch Set: Rebase against top of tree. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser_commands_mac.cc ('k') | chrome/browser/ui/cocoa/browser_window_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/browser_window_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
index cb0836427ce5aac3bd634eada68834f0877e7472..de98e9b404c23389c2f9ba155643707f5db0cfc4 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -606,29 +606,15 @@ void BrowserWindowCocoa::Paste() {
}
void BrowserWindowCocoa::EnterFullscreenWithChrome() {
- // This method cannot be called if simplified fullscreen is enabled.
- const CommandLine* command_line = CommandLine::ForCurrentProcess();
- DCHECK(!command_line->HasSwitch(switches::kEnableSimplifiedFullscreen));
-
CHECK(chrome::mac::SupportsSystemFullscreen());
[controller_ enterFullscreenWithChrome];
}
bool BrowserWindowCocoa::IsFullscreenWithChrome() {
- // The WithChrome mode does not exist when simplified fullscreen is enabled.
- const CommandLine* command_line = CommandLine::ForCurrentProcess();
- if (command_line->HasSwitch(switches::kEnableSimplifiedFullscreen))
- return false;
return IsFullscreen() && ![controller_ inPresentationMode];
}
bool BrowserWindowCocoa::IsFullscreenWithoutChrome() {
- // Presentation mode does not exist if simplified fullscreen is enabled. The
- // WithoutChrome mode simply maps to whether or not the window is fullscreen.
- const CommandLine* command_line = CommandLine::ForCurrentProcess();
- if (command_line->HasSwitch(switches::kEnableSimplifiedFullscreen))
- return IsFullscreen();
-
return IsFullscreen() && [controller_ inPresentationMode];
}
« no previous file with comments | « chrome/browser/ui/browser_commands_mac.cc ('k') | chrome/browser/ui/cocoa/browser_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698