OLD | NEW |
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/common/wm/workspace/workspace_layout_manager.h" | 5 #include "ash/common/wm/workspace/workspace_layout_manager.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "ash/common/shell_observer.h" | 10 #include "ash/common/shell_observer.h" |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
148 // Create a popup window out of display boundaries and make sure it is not | 148 // Create a popup window out of display boundaries and make sure it is not |
149 // moved to have minimum visibility. | 149 // moved to have minimum visibility. |
150 ui::Window* mus_window = | 150 ui::Window* mus_window = |
151 CreateTestWindow(gfx::Rect(400, 100, 50, 50), ui::wm::WINDOW_TYPE_POPUP); | 151 CreateTestWindow(gfx::Rect(400, 100, 50, 50), ui::wm::WINDOW_TYPE_POPUP); |
152 WmWindowMus* window = WmWindowMus::Get(mus_window); | 152 WmWindowMus* window = WmWindowMus::Get(mus_window); |
153 EXPECT_EQ("400,100 50x50", window->GetBoundsInScreen().ToString()); | 153 EXPECT_EQ("400,100 50x50", window->GetBoundsInScreen().ToString()); |
154 } | 154 } |
155 | 155 |
156 /* | 156 /* |
157 TEST_F(WorkspaceLayoutManagerTest, KeepRestoredWindowInDisplay) { | 157 TEST_F(WorkspaceLayoutManagerTest, KeepRestoredWindowInDisplay) { |
158 if (!SupportsHostWindowResize()) | |
159 return; | |
160 std::unique_ptr<aura::Window> window( | 158 std::unique_ptr<aura::Window> window( |
161 CreateTestWindowInShellWithBounds(gfx::Rect(1, 2, 30, 40))); | 159 CreateTestWindowInShellWithBounds(gfx::Rect(1, 2, 30, 40))); |
162 wm::WindowState* window_state = wm::GetWindowState(window.get()); | 160 wm::WindowState* window_state = wm::GetWindowState(window.get()); |
163 | 161 |
164 // Maximized -> Normal transition. | 162 // Maximized -> Normal transition. |
165 window_state->Maximize(); | 163 window_state->Maximize(); |
166 window_state->SetRestoreBoundsInScreen(gfx::Rect(-100, -100, 30, 40)); | 164 window_state->SetRestoreBoundsInScreen(gfx::Rect(-100, -100, 30, 40)); |
167 window_state->Restore(); | 165 window_state->Restore(); |
168 EXPECT_TRUE( | 166 EXPECT_TRUE( |
169 Shell::GetPrimaryRootWindow()->bounds().Intersects(window->bounds())); | 167 Shell::GetPrimaryRootWindow()->bounds().Intersects(window->bounds())); |
(...skipping 921 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1091 occluded_window_bounds.width(), | 1089 occluded_window_bounds.width(), |
1092 occluded_window_bounds.height()).ToString(), | 1090 occluded_window_bounds.height()).ToString(), |
1093 window->bounds().ToString()); | 1091 window->bounds().ToString()); |
1094 HideKeyboard(); | 1092 HideKeyboard(); |
1095 EXPECT_EQ(occluded_window_bounds.ToString(), window->bounds().ToString()); | 1093 EXPECT_EQ(occluded_window_bounds.ToString(), window->bounds().ToString()); |
1096 } | 1094 } |
1097 */ | 1095 */ |
1098 | 1096 |
1099 } // namespace mus | 1097 } // namespace mus |
1100 } // namespace ash | 1098 } // namespace ash |
OLD | NEW |