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

Unified Diff: ash/screen_ash_unittest.cc

Issue 11419271: Revert "Use WS_POPUP for ash_unittests" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/screen_ash_unittest.cc
diff --git a/ash/screen_ash_unittest.cc b/ash/screen_ash_unittest.cc
index 79e56270d6a31fd498be582856b84c51005189a2..0fc71a6aa46b912eb7e5a7eb0bf36f1dcc55572a 100644
--- a/ash/screen_ash_unittest.cc
+++ b/ash/screen_ash_unittest.cc
@@ -20,6 +20,7 @@ namespace test {
typedef test::AshTestBase ScreenAshTest;
+#if !defined(OS_WIN)
TEST_F(ScreenAshTest, Bounds) {
UpdateDisplay("600x600,500x500");
Shell::GetPrimaryRootWindowController()->SetShelfAutoHideBehavior(
@@ -56,6 +57,7 @@ TEST_F(ScreenAshTest, Bounds) {
ScreenAsh::GetDisplayWorkAreaBoundsInParent(
secondary->GetNativeView()).ToString());
}
+#endif
TEST_F(ScreenAshTest, ConvertRect) {
UpdateDisplay("600x600,500x500");
« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698