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/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/shell_port.h" |
8 #include "ash/test/ash_test_base.h" | 9 #include "ash/test/ash_test_base.h" |
9 #include "ash/wm/window_util.h" | 10 #include "ash/wm/window_util.h" |
10 #include "ash/wm/wm_screen_util.h" | 11 #include "ash/wm/wm_screen_util.h" |
11 #include "ash/wm_shell.h" | |
12 #include "ash/wm_window.h" | 12 #include "ash/wm_window.h" |
13 #include "ui/aura/env.h" | 13 #include "ui/aura/env.h" |
14 #include "ui/aura/window.h" | 14 #include "ui/aura/window.h" |
15 #include "ui/aura/window_event_dispatcher.h" | 15 #include "ui/aura/window_event_dispatcher.h" |
16 #include "ui/display/manager/display_manager.h" | 16 #include "ui/display/manager/display_manager.h" |
17 #include "ui/views/widget/widget.h" | 17 #include "ui/views/widget/widget.h" |
18 #include "ui/views/widget/widget_delegate.h" | 18 #include "ui/views/widget/widget_delegate.h" |
19 #include "ui/wm/core/coordinate_conversion.h" | 19 #include "ui/wm/core/coordinate_conversion.h" |
20 | 20 |
21 namespace ash { | 21 namespace ash { |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 ::wm::ConvertRectToScreen(primary->GetNativeView(), &r3); | 99 ::wm::ConvertRectToScreen(primary->GetNativeView(), &r3); |
100 EXPECT_EQ("40,40 100x100", r3.ToString()); | 100 EXPECT_EQ("40,40 100x100", r3.ToString()); |
101 | 101 |
102 gfx::Rect r4(40, 40, 100, 100); | 102 gfx::Rect r4(40, 40, 100, 100); |
103 ::wm::ConvertRectToScreen(secondary->GetNativeView(), &r4); | 103 ::wm::ConvertRectToScreen(secondary->GetNativeView(), &r4); |
104 EXPECT_EQ("650,50 100x100", r4.ToString()); | 104 EXPECT_EQ("650,50 100x100", r4.ToString()); |
105 } | 105 } |
106 | 106 |
107 TEST_F(ScreenUtilTest, ShelfDisplayBoundsInUnifiedDesktop) { | 107 TEST_F(ScreenUtilTest, ShelfDisplayBoundsInUnifiedDesktop) { |
108 // TODO: requires unified desktop mode. http://crbug.com/581462. | 108 // TODO: requires unified desktop mode. http://crbug.com/581462. |
109 if (WmShell::Get()->IsRunningInMash()) | 109 if (ShellPort::Get()->IsRunningInMash()) |
110 return; | 110 return; |
111 | 111 |
112 display_manager()->SetUnifiedDesktopEnabled(true); | 112 display_manager()->SetUnifiedDesktopEnabled(true); |
113 | 113 |
114 views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds( | 114 views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds( |
115 NULL, CurrentContext(), gfx::Rect(10, 10, 100, 100)); | 115 NULL, CurrentContext(), gfx::Rect(10, 10, 100, 100)); |
116 WmWindow* window = WmWindow::Get(widget->GetNativeWindow()); | 116 WmWindow* window = WmWindow::Get(widget->GetNativeWindow()); |
117 | 117 |
118 UpdateDisplay("500x400"); | 118 UpdateDisplay("500x400"); |
119 EXPECT_EQ("0,0 500x400", wm::GetDisplayBoundsWithShelf(window).ToString()); | 119 EXPECT_EQ("0,0 500x400", wm::GetDisplayBoundsWithShelf(window).ToString()); |
120 | 120 |
121 UpdateDisplay("500x400,600x400"); | 121 UpdateDisplay("500x400,600x400"); |
122 EXPECT_EQ("0,0 500x400", wm::GetDisplayBoundsWithShelf(window).ToString()); | 122 EXPECT_EQ("0,0 500x400", wm::GetDisplayBoundsWithShelf(window).ToString()); |
123 | 123 |
124 // Move to the 2nd physical display. Shelf's display still should be | 124 // Move to the 2nd physical display. Shelf's display still should be |
125 // the first. | 125 // the first. |
126 widget->SetBounds(gfx::Rect(800, 0, 100, 100)); | 126 widget->SetBounds(gfx::Rect(800, 0, 100, 100)); |
127 ASSERT_EQ("800,0 100x100", widget->GetWindowBoundsInScreen().ToString()); | 127 ASSERT_EQ("800,0 100x100", widget->GetWindowBoundsInScreen().ToString()); |
128 | 128 |
129 EXPECT_EQ("0,0 500x400", wm::GetDisplayBoundsWithShelf(window).ToString()); | 129 EXPECT_EQ("0,0 500x400", wm::GetDisplayBoundsWithShelf(window).ToString()); |
130 | 130 |
131 UpdateDisplay("600x500"); | 131 UpdateDisplay("600x500"); |
132 EXPECT_EQ("0,0 600x500", wm::GetDisplayBoundsWithShelf(window).ToString()); | 132 EXPECT_EQ("0,0 600x500", wm::GetDisplayBoundsWithShelf(window).ToString()); |
133 } | 133 } |
134 | 134 |
135 } // namespace test | 135 } // namespace test |
136 } // namespace ash | 136 } // namespace ash |
OLD | NEW |