diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-29 01:01:15 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-29 01:01:15 +0000 |
| commit | abd4d9a627747c1928927c7bad77391818ed985c (patch) | |
| tree | 0343ec595fa9ff279659f9761df7164d17cbec24 /ui | |
| parent | b5528a2437b6874af7fc4a57dee3d6be940f02c2 (diff) | |
| download | chromium_src-abd4d9a627747c1928927c7bad77391818ed985c.zip chromium_src-abd4d9a627747c1928927c7bad77391818ed985c.tar.gz chromium_src-abd4d9a627747c1928927c7bad77391818ed985c.tar.bz2 | |
Switch to Cocoa APIs for fullscreen.
BUG=none
TEST=none
TBR=thakis@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11697004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174754 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/cocoa/fullscreen_window_manager_unittest.mm | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/ui/base/cocoa/fullscreen_window_manager_unittest.mm b/ui/base/cocoa/fullscreen_window_manager_unittest.mm index eee5097..710ec79 100644 --- a/ui/base/cocoa/fullscreen_window_manager_unittest.mm +++ b/ui/base/cocoa/fullscreen_window_manager_unittest.mm @@ -4,7 +4,6 @@ #import "ui/base/cocoa/fullscreen_window_manager.h" - #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" #import "ui/base/test/ui_cocoa_test_helper.h" @@ -17,15 +16,18 @@ TEST_F(FullscreenWindowManagerTest, EnterExit) { initWithWindow:test_window() desiredScreen:[NSScreen mainScreen]]); - SystemUIMode mode = kUIModeNormal; - GetSystemUIMode(&mode, NULL); - EXPECT_EQ(kUIModeNormal, mode); + NSApplicationPresentationOptions current_options = + [NSApp presentationOptions]; + EXPECT_EQ(NSApplicationPresentationDefault, current_options); [manager enterFullscreenMode]; - GetSystemUIMode(&mode, NULL); - EXPECT_EQ(kUIModeAllHidden, mode); + current_options = [NSApp presentationOptions]; + EXPECT_EQ(static_cast<NSApplicationPresentationOptions>( + NSApplicationPresentationHideDock | + NSApplicationPresentationHideMenuBar), + current_options); [manager exitFullscreenMode]; - GetSystemUIMode(&mode, NULL); - EXPECT_EQ(kUIModeNormal, mode); + current_options = [NSApp presentationOptions]; + EXPECT_EQ(NSApplicationPresentationDefault, current_options); } |