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