OLD | NEW |
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/screen_util.h" | 5 #include "ash/screen_util.h" |
6 | 6 |
7 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
8 #include "ash/shelf/shelf_layout_manager.h" | 8 #include "ash/shelf/shelf_layout_manager.h" |
9 #include "ash/shelf/shelf_widget.h" | 9 #include "ash/shelf/shelf_widget.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
11 #include "ash/test/ash_test_base.h" | 11 #include "ash/test/ash_test_base.h" |
12 #include "ash/wm/window_util.h" | 12 #include "ash/wm/window_util.h" |
13 #include "ui/aura/env.h" | 13 #include "ui/aura/env.h" |
14 #include "ui/aura/root_window.h" | |
15 #include "ui/aura/window.h" | 14 #include "ui/aura/window.h" |
| 15 #include "ui/aura/window_event_dispatcher.h" |
16 #include "ui/views/widget/widget.h" | 16 #include "ui/views/widget/widget.h" |
17 #include "ui/views/widget/widget_delegate.h" | 17 #include "ui/views/widget/widget_delegate.h" |
18 | 18 |
19 namespace ash { | 19 namespace ash { |
20 namespace test { | 20 namespace test { |
21 | 21 |
22 typedef test::AshTestBase ScreenUtilTest; | 22 typedef test::AshTestBase ScreenUtilTest; |
23 | 23 |
24 TEST_F(ScreenUtilTest, Bounds) { | 24 TEST_F(ScreenUtilTest, Bounds) { |
25 if (!SupportsMultipleDisplays()) | 25 if (!SupportsMultipleDisplays()) |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 ScreenUtil::ConvertRectToScreen( | 107 ScreenUtil::ConvertRectToScreen( |
108 primary->GetNativeView(), gfx::Rect(30, 30, 100, 100)).ToString()); | 108 primary->GetNativeView(), gfx::Rect(30, 30, 100, 100)).ToString()); |
109 EXPECT_EQ( | 109 EXPECT_EQ( |
110 "650,50 100x100", | 110 "650,50 100x100", |
111 ScreenUtil::ConvertRectToScreen( | 111 ScreenUtil::ConvertRectToScreen( |
112 secondary->GetNativeView(), gfx::Rect(40, 40, 100, 100)).ToString()); | 112 secondary->GetNativeView(), gfx::Rect(40, 40, 100, 100)).ToString()); |
113 } | 113 } |
114 | 114 |
115 } // namespace test | 115 } // namespace test |
116 } // namespace ash | 116 } // namespace ash |
OLD | NEW |