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 824 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
835 | 835 |
836 [controller_ enterFullscreen]; | 836 [controller_ enterFullscreen]; |
837 WaitForFullScreenTransition(); | 837 WaitForFullScreenTransition(); |
838 EXPECT_TRUE([controller_ isFullscreen]); | 838 EXPECT_TRUE([controller_ isFullscreen]); |
839 | 839 |
840 [controller_ exitFullscreen]; | 840 [controller_ exitFullscreen]; |
841 WaitForFullScreenTransition(); | 841 WaitForFullScreenTransition(); |
842 EXPECT_FALSE([controller_ isFullscreen]); | 842 EXPECT_FALSE([controller_ isFullscreen]); |
843 } | 843 } |
844 | 844 |
845 // If this test fails, it is usually a sign that the bots have some sort of | 845 // If this test fails, it is usually a sign that the bots have some sort of |
viettrungluu
2014/07/23 15:16:34
Hmmm. This comment is worth reading and investigat
jam
2014/07/23 15:20:04
when disabling flaky tests, we don't have the band
viettrungluu
2014/07/23 15:51:33
Fair enough, but how recent is the flakiness? (Cou
jam
2014/07/23 15:55:42
That data is continuously updated, so it's recent.
| |
846 // problem (such as a modal dialog up). This tests is a very useful canary, so | 846 // problem (such as a modal dialog up). This tests is a very useful canary, so |
847 // please do not mark it as flaky without first verifying that there are no bot | 847 // please do not mark it as flaky without first verifying that there are no bot |
848 // problems. | 848 // problems. |
849 TEST_F(BrowserWindowFullScreenControllerTest, TestActivate) { | 849 // http://crbug.com/53586 |
850 TEST_F(BrowserWindowFullScreenControllerTest, DISABLED_TestActivate) { | |
850 [controller_ showWindow:nil]; | 851 [controller_ showWindow:nil]; |
851 | 852 |
852 EXPECT_FALSE([controller_ isFullscreen]); | 853 EXPECT_FALSE([controller_ isFullscreen]); |
853 | 854 |
854 [controller_ activate]; | 855 [controller_ activate]; |
855 EXPECT_TRUE(IsFrontWindow([controller_ window])); | 856 EXPECT_TRUE(IsFrontWindow([controller_ window])); |
856 | 857 |
857 [controller_ enterFullscreen]; | 858 [controller_ enterFullscreen]; |
858 WaitForFullScreenTransition(); | 859 WaitForFullScreenTransition(); |
859 [controller_ activate]; | 860 [controller_ activate]; |
(...skipping 21 matching lines...) Expand all Loading... | |
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 [[testFullscreenWindow_ contentView] cr_setWantsLayer:YES]; | 886 [[testFullscreenWindow_ contentView] cr_setWantsLayer:YES]; |
886 return testFullscreenWindow_.get(); | 887 return testFullscreenWindow_.get(); |
887 } | 888 } |
888 @end | 889 @end |
889 | 890 |
890 /* TODO(???): test other methods of BrowserWindowController */ | 891 /* TODO(???): test other methods of BrowserWindowController */ |
OLD | NEW |