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

Side by Side Diff: ash/display/screen_position_controller_unittest.cc

Issue 16539005: Skip mulitple-dispay tests on win8 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed comment Created 7 years, 6 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 | Annotate | Revision Log
OLDNEW
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 #include "ash/display/screen_position_controller.h" 5 #include "ash/display/screen_position_controller.h"
6 6
7 #include "ash/display/display_controller.h" 7 #include "ash/display/display_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/test/ash_test_base.h" 9 #include "ash/test/ash_test_base.h"
10 #include "ash/test/shell_test_api.h" 10 #include "ash/test/shell_test_api.h"
11 #include "ui/aura/env.h" 11 #include "ui/aura/env.h"
12 #include "ui/aura/root_window.h" 12 #include "ui/aura/root_window.h"
13 #include "ui/aura/test/test_window_delegate.h" 13 #include "ui/aura/test/test_window_delegate.h"
14 #include "ui/base/layout.h" 14 #include "ui/base/layout.h"
15 #include "ui/gfx/screen.h" 15 #include "ui/gfx/screen.h"
16 16
17 #if defined(OS_WIN) 17 #if defined(OS_WIN)
18 // TOD(mazda): UpdateDisplay does not work properly on Win. 18 // TODO(scottmg): RootWindow doesn't get resized immediately on Windows
19 // Fix this and enable tests. 19 // Ash. http://crbug.com/247916.
20 #define MAYBE_ConvertHostPointToScreen DISABLED_ConvertHostPointToScreen 20 #define MAYBE_ConvertHostPointToScreen DISABLED_ConvertHostPointToScreen
21 #define MAYBE_ConvertHostPointToScreenHiDPI DISABLED_ConvertHostPointToScreenHiD PI 21 #define MAYBE_ConvertHostPointToScreenHiDPI DISABLED_ConvertHostPointToScreenHiD PI
22 #define MAYBE_ConvertHostPointToScreenRotate DISABLED_ConvertHostPointToScreenRo tate 22 #define MAYBE_ConvertHostPointToScreenRotate DISABLED_ConvertHostPointToScreenRo tate
23 #define MAYBE_ConvertHostPointToScreenUIScale DISABLED_ConvertHostPointToScreenU IScale 23 #define MAYBE_ConvertHostPointToScreenUIScale DISABLED_ConvertHostPointToScreenU IScale
24 #else 24 #else
25 #define MAYBE_ConvertHostPointToScreen ConvertHostPointToScreen 25 #define MAYBE_ConvertHostPointToScreen ConvertHostPointToScreen
26 #define MAYBE_ConvertHostPointToScreenHiDPI ConvertHostPointToScreenHiDPI 26 #define MAYBE_ConvertHostPointToScreenHiDPI ConvertHostPointToScreenHiDPI
27 #define MAYBE_ConvertHostPointToScreenRotate ConvertHostPointToScreenRotate 27 #define MAYBE_ConvertHostPointToScreenRotate ConvertHostPointToScreenRotate
28 #define MAYBE_ConvertHostPointToScreenUIScale ConvertHostPointToScreenUIScale 28 #define MAYBE_ConvertHostPointToScreenUIScale ConvertHostPointToScreenUIScale
29 #endif 29 #endif
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 EXPECT_EQ("210,70", ConvertHostPointToScreen(60, 70)); 264 EXPECT_EQ("210,70", ConvertHostPointToScreen(60, 70));
265 // The point is out of the host windows. 265 // The point is out of the host windows.
266 EXPECT_EQ("210,-50", ConvertHostPointToScreen(60, -50)); 266 EXPECT_EQ("210,-50", ConvertHostPointToScreen(60, -50));
267 // The point is on the 2nd host. Point on 1nd host (60, 60) 267 // The point is on the 2nd host. Point on 1nd host (60, 60)
268 // 1/2 * 1.5 = (45,45) 268 // 1/2 * 1.5 = (45,45)
269 EXPECT_EQ("45,45", ConvertHostPointToScreen(60, -340)); 269 EXPECT_EQ("45,45", ConvertHostPointToScreen(60, -340));
270 } 270 }
271 271
272 } // namespace test 272 } // namespace test
273 } // namespace ash 273 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/root_window_transformers_unittest.cc ('k') | ash/drag_drop/drag_drop_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698