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

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

Issue 2445583002: Relocate display_manager from ash to ui (Closed)
Patch Set: Created 4 years, 2 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
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 "ash/display/display_util.h" 5 #include "ash/display/display_util.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_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/display_manager_test_api.h" 10 #include "ui/display/test/display_manager_test_api.h"
oshima 2016/10/24 19:29:16 This isn't used?
rjkroege 2016/10/25 23:30:26 Done.
11 11
12 namespace ash { 12 namespace ash {
13 13
14 typedef test::AshTestBase DisplayUtilTest; 14 typedef test::AshTestBase DisplayUtilTest;
15 15
16 TEST_F(DisplayUtilTest, RotatedDisplay) { 16 TEST_F(DisplayUtilTest, RotatedDisplay) {
17 if (!SupportsMultipleDisplays()) 17 if (!SupportsMultipleDisplays())
18 return; 18 return;
19 { 19 {
20 UpdateDisplay("10+10-500x400,600+10-1000x600/r"); 20 UpdateDisplay("10+10-500x400,600+10-1000x600/r");
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 AshWindowTreeHost* host1 = 85 AshWindowTreeHost* host1 =
86 GetRootWindowController(root_windows[1])->ash_host(); 86 GetRootWindowController(root_windows[1])->ash_host();
87 gfx::Rect rect0 = GetNativeEdgeBounds(host0, gfx::Rect(499, 10, 1, 300)); 87 gfx::Rect rect0 = GetNativeEdgeBounds(host0, gfx::Rect(499, 10, 1, 300));
88 gfx::Rect rect1 = GetNativeEdgeBounds(host1, gfx::Rect(500, 10, 1, 300)); 88 gfx::Rect rect1 = GetNativeEdgeBounds(host1, gfx::Rect(500, 10, 1, 300));
89 EXPECT_EQ("10,99 1x300", rect0.ToString()); 89 EXPECT_EQ("10,99 1x300", rect0.ToString());
90 EXPECT_EQ("600,20 1x300", rect1.ToString()); 90 EXPECT_EQ("600,20 1x300", rect1.ToString());
91 } 91 }
92 } 92 }
93 93
94 } // namespace ash 94 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698