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

Side by Side Diff: extensions/browser/app_window/app_window_interactive_uitest.cc

Issue 1634343002: Disable AppWindowTest.InitFullscreenAndAlwaysOnTop on Windows. Flaky. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "build/build_config.h" 5 #include "build/build_config.h"
6 #include "chrome/browser/apps/app_browsertest_util.h" 6 #include "chrome/browser/apps/app_browsertest_util.h"
7 #include "extensions/browser/app_window/native_app_window.h" 7 #include "extensions/browser/app_window/native_app_window.h"
8 8
9 namespace extensions { 9 namespace extensions {
10 10
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 IN_PROC_BROWSER_TEST_F(AppWindowTest, MAYBE_RuntimeFullscreenToAlwaysOnTop) { 126 IN_PROC_BROWSER_TEST_F(AppWindowTest, MAYBE_RuntimeFullscreenToAlwaysOnTop) {
127 AppWindow* window = CreateTestAppWindow("{}"); 127 AppWindow* window = CreateTestAppWindow("{}");
128 ASSERT_TRUE(window); 128 ASSERT_TRUE(window);
129 129
130 window->Fullscreen(); 130 window->Fullscreen();
131 CheckFullscreenToAlwaysOnTop(window); 131 CheckFullscreenToAlwaysOnTop(window);
132 132
133 CloseAppWindow(window); 133 CloseAppWindow(window);
134 } 134 }
135 135
136 #if defined(OS_MACOSX) 136 // Flaky on Windows (see http://crbug.com/581131).
137 #if defined(OS_MACOSX) || defined(OS_WIN)
137 #define MAYBE_InitFullscreenAndAlwaysOnTop DISABLED_InitFullscreenAndAlwaysOnTop 138 #define MAYBE_InitFullscreenAndAlwaysOnTop DISABLED_InitFullscreenAndAlwaysOnTop
138 #else 139 #else
139 #define MAYBE_InitFullscreenAndAlwaysOnTop InitFullscreenAndAlwaysOnTop 140 #define MAYBE_InitFullscreenAndAlwaysOnTop InitFullscreenAndAlwaysOnTop
140 #endif 141 #endif
141 142
142 // Tests a window created with both fullscreen and always-on-top enabled. Ensure 143 // Tests a window created with both fullscreen and always-on-top enabled. Ensure
143 // that always-on-top is only applied when the window exits fullscreen. 144 // that always-on-top is only applied when the window exits fullscreen.
144 IN_PROC_BROWSER_TEST_F(AppWindowTest, MAYBE_InitFullscreenAndAlwaysOnTop) { 145 IN_PROC_BROWSER_TEST_F(AppWindowTest, MAYBE_InitFullscreenAndAlwaysOnTop) {
145 AppWindow* window = CreateTestAppWindow( 146 AppWindow* window = CreateTestAppWindow(
146 "{ \"alwaysOnTop\": true, \"state\": \"fullscreen\" }"); 147 "{ \"alwaysOnTop\": true, \"state\": \"fullscreen\" }");
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 EXPECT_FALSE(window->GetBaseWindow()->IsAlwaysOnTop()); 180 EXPECT_FALSE(window->GetBaseWindow()->IsAlwaysOnTop());
180 181
181 // Ensure that always-on-top remains disabled. 182 // Ensure that always-on-top remains disabled.
182 window->Restore(); 183 window->Restore();
183 EXPECT_FALSE(window->GetBaseWindow()->IsAlwaysOnTop()); 184 EXPECT_FALSE(window->GetBaseWindow()->IsAlwaysOnTop());
184 185
185 CloseAppWindow(window); 186 CloseAppWindow(window);
186 } 187 }
187 188
188 } // namespace extensions 189 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698