| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/fullscreen.h" | 5 #import "chrome/browser/fullscreen.h" |
| 6 | 6 |
| 7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/mac/mac_util.h" | |
| 11 #include "base/mac/sdk_forward_declarations.h" | 10 #include "base/mac/sdk_forward_declarations.h" |
| 12 #include "chrome/common/chrome_switches.h" | 11 #include "chrome/common/chrome_switches.h" |
| 13 | 12 |
| 14 bool IsFullScreenMode() { | 13 bool IsFullScreenMode() { |
| 15 // Check if the main display has been captured (by games in particular). | 14 // Check if the main display has been captured (by games in particular). |
| 16 if (CGDisplayIsCaptured(CGMainDisplayID())) | 15 if (CGDisplayIsCaptured(CGMainDisplayID())) |
| 17 return true; | 16 return true; |
| 18 | 17 |
| 19 NSApplicationPresentationOptions options = | 18 NSApplicationPresentationOptions options = |
| 20 [NSApp currentSystemPresentationOptions]; | 19 [NSApp currentSystemPresentationOptions]; |
| (...skipping 12 matching lines...) Expand all Loading... |
| 33 if (options & NSApplicationPresentationFullScreen) | 32 if (options & NSApplicationPresentationFullScreen) |
| 34 return true; | 33 return true; |
| 35 | 34 |
| 36 return false; | 35 return false; |
| 37 } | 36 } |
| 38 | 37 |
| 39 namespace chrome { | 38 namespace chrome { |
| 40 namespace mac { | 39 namespace mac { |
| 41 | 40 |
| 42 bool SupportsSystemFullscreen() { | 41 bool SupportsSystemFullscreen() { |
| 43 return base::mac::IsOSLionOrLater(); | 42 // TODO(spqchan): Clean this up, https://crbug.com/579259 |
| 43 return true; |
| 44 } | 44 } |
| 45 | 45 |
| 46 } // namespace mac | 46 } // namespace mac |
| 47 } // namespace chrome | 47 } // namespace chrome |
| OLD | NEW |