OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "base/mac/mac_util.h" | 7 #include "base/mac/mac_util.h" |
8 #import "base/mac/scoped_nsobject.h" | 8 #import "base/mac/scoped_nsobject.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 810 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
821 [[frontmostWindow parentWindow] isEqual:window]; | 821 [[frontmostWindow parentWindow] isEqual:window]; |
822 } | 822 } |
823 | 823 |
824 void WaitForFullScreenTransition() { | 824 void WaitForFullScreenTransition() { |
825 content::WindowedNotificationObserver observer( | 825 content::WindowedNotificationObserver observer( |
826 chrome::NOTIFICATION_FULLSCREEN_CHANGED, | 826 chrome::NOTIFICATION_FULLSCREEN_CHANGED, |
827 content::NotificationService::AllSources()); | 827 content::NotificationService::AllSources()); |
828 observer.Wait(); | 828 observer.Wait(); |
829 } | 829 } |
830 | 830 |
831 TEST_F(BrowserWindowFullScreenControllerTest, TestFullscreen) { | 831 // http://crbug.com/53586 |
| 832 TEST_F(BrowserWindowFullScreenControllerTest, DISABLED_TestFullscreen) { |
832 [controller_ showWindow:nil]; | 833 [controller_ showWindow:nil]; |
833 EXPECT_FALSE([controller_ isFullscreen]); | 834 EXPECT_FALSE([controller_ isFullscreen]); |
834 | 835 |
835 [controller_ enterFullscreen]; | 836 [controller_ enterFullscreen]; |
836 WaitForFullScreenTransition(); | 837 WaitForFullScreenTransition(); |
837 EXPECT_TRUE([controller_ isFullscreen]); | 838 EXPECT_TRUE([controller_ isFullscreen]); |
838 | 839 |
839 [controller_ exitFullscreen]; | 840 [controller_ exitFullscreen]; |
840 WaitForFullScreenTransition(); | 841 WaitForFullScreenTransition(); |
841 EXPECT_FALSE([controller_ isFullscreen]); | 842 EXPECT_FALSE([controller_ isFullscreen]); |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
880 testFullscreenWindow_.reset( | 881 testFullscreenWindow_.reset( |
881 [[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,400,400) | 882 [[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,400,400) |
882 styleMask:NSBorderlessWindowMask | 883 styleMask:NSBorderlessWindowMask |
883 backing:NSBackingStoreBuffered | 884 backing:NSBackingStoreBuffered |
884 defer:NO]); | 885 defer:NO]); |
885 return testFullscreenWindow_.get(); | 886 return testFullscreenWindow_.get(); |
886 } | 887 } |
887 @end | 888 @end |
888 | 889 |
889 /* TODO(???): test other methods of BrowserWindowController */ | 890 /* TODO(???): test other methods of BrowserWindowController */ |
OLD | NEW |