| 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/wm/base_layout_manager.h" | 5 #include "ash/wm/base_layout_manager.h" |
| 6 | 6 |
| 7 #include "ash/screen_ash.h" | 7 #include "ash/screen_ash.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/shell_window_ids.h" | 9 #include "ash/shell_window_ids.h" |
| 10 #include "ash/test/ash_test_base.h" | 10 #include "ash/test/ash_test_base.h" |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 // Enlarge the root window. We should still match the display size. | 119 // Enlarge the root window. We should still match the display size. |
| 120 Shell::GetPrimaryRootWindow()->SetHostSize(gfx::Size(800, 600)); | 120 Shell::GetPrimaryRootWindow()->SetHostSize(gfx::Size(800, 600)); |
| 121 EXPECT_EQ(Shell::GetScreen()->GetDisplayNearestWindow( | 121 EXPECT_EQ(Shell::GetScreen()->GetDisplayNearestWindow( |
| 122 window.get()).bounds().ToString(), | 122 window.get()).bounds().ToString(), |
| 123 window->bounds().ToString()); | 123 window->bounds().ToString()); |
| 124 } | 124 } |
| 125 | 125 |
| 126 // Fails on Mac only. Need to be implemented. http://crbug.com/111279. | 126 // Fails on Mac only. Need to be implemented. http://crbug.com/111279. |
| 127 #if defined(OS_MACOSX) | 127 #if defined(OS_MACOSX) |
| 128 #define MAYBE_RootWindowResizeShrinksWindows \ | 128 #define MAYBE_RootWindowResizeShrinksWindows \ |
| 129 FAILS_RootWindowResizeShrinksWindows | 129 DISABLED_RootWindowResizeShrinksWindows |
| 130 #else | 130 #else |
| 131 #define MAYBE_RootWindowResizeShrinksWindows RootWindowResizeShrinksWindows | 131 #define MAYBE_RootWindowResizeShrinksWindows RootWindowResizeShrinksWindows |
| 132 #endif | 132 #endif |
| 133 // Tests that when the screen gets smaller the windows aren't bigger than | 133 // Tests that when the screen gets smaller the windows aren't bigger than |
| 134 // the screen. | 134 // the screen. |
| 135 TEST_F(BaseLayoutManagerTest, MAYBE_RootWindowResizeShrinksWindows) { | 135 TEST_F(BaseLayoutManagerTest, MAYBE_RootWindowResizeShrinksWindows) { |
| 136 scoped_ptr<aura::Window> window( | 136 scoped_ptr<aura::Window> window( |
| 137 CreateTestWindow(gfx::Rect(10, 20, 500, 400))); | 137 CreateTestWindow(gfx::Rect(10, 20, 500, 400))); |
| 138 gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow( | 138 gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow( |
| 139 window.get()).work_area(); | 139 window.get()).work_area(); |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 GetRestoreBoundsInParent(window.get()).ToString()); | 229 GetRestoreBoundsInParent(window.get()).ToString()); |
| 230 EXPECT_TRUE(wm::IsWindowMaximized(window.get())); | 230 EXPECT_TRUE(wm::IsWindowMaximized(window.get())); |
| 231 | 231 |
| 232 wm::RestoreWindow(window.get()); | 232 wm::RestoreWindow(window.get()); |
| 233 EXPECT_EQ(bounds.ToString(), window->bounds().ToString()); | 233 EXPECT_EQ(bounds.ToString(), window->bounds().ToString()); |
| 234 } | 234 } |
| 235 | 235 |
| 236 } // namespace | 236 } // namespace |
| 237 | 237 |
| 238 } // namespace ash | 238 } // namespace ash |
| OLD | NEW |