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

Unified Diff: ash/root_window_controller_unittest.cc

Issue 2618143002: cros: Remove some OS platform ifdefs from ash (Closed)
Patch Set: rebase Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller_unittest.cc
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index 8da08162328beb4b326b19583d2e2a9bf6bf5b66..48aadbd3d6419c4de5b705848184ba2e00089db9 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -1236,16 +1236,9 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, ZOrderTest) {
menu.reset();
}
-// Resolution in UpdateDisplay is not being respected on Windows 8.
-#if defined(OS_WIN)
-#define MAYBE_DisplayRotation DISABLED_DisplayRotation
-#else
-#define MAYBE_DisplayRotation DisplayRotation
-#endif
-
// Tests that the virtual keyboard correctly resizes with a change to display
// orientation. See crbug/417612.
-TEST_F(VirtualKeyboardRootWindowControllerTest, MAYBE_DisplayRotation) {
+TEST_F(VirtualKeyboardRootWindowControllerTest, DisplayRotation) {
UpdateDisplay("800x600");
aura::Window* root_window = Shell::GetPrimaryRootWindow();
aura::Window* keyboard_container =
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698