| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "ui/aura_shell/toplevel_layout_manager.h" | 5 #include "ui/aura_shell/toplevel_layout_manager.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "ui/aura/client/aura_constants.h" | 9 #include "ui/aura/client/aura_constants.h" |
| 10 #include "ui/aura/desktop.h" | 10 #include "ui/aura/desktop.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 window->SetParent(container_.get()); | 42 window->SetParent(container_.get()); |
| 43 return window; | 43 return window; |
| 44 } | 44 } |
| 45 | 45 |
| 46 private: | 46 private: |
| 47 // Owned by |container_|. | 47 // Owned by |container_|. |
| 48 internal::ToplevelLayoutManager* layout_manager_; | 48 internal::ToplevelLayoutManager* layout_manager_; |
| 49 | 49 |
| 50 scoped_ptr<aura::Window> container_; | 50 scoped_ptr<aura::Window> container_; |
| 51 | 51 |
| 52 private: | |
| 53 DISALLOW_COPY_AND_ASSIGN(ToplevelLayoutManagerTest); | 52 DISALLOW_COPY_AND_ASSIGN(ToplevelLayoutManagerTest); |
| 54 }; | 53 }; |
| 55 | 54 |
| 56 } // namespace | 55 } // namespace |
| 57 | 56 |
| 58 // Tests normal->maximize->normal. | 57 // Tests normal->maximize->normal. |
| 59 TEST_F(ToplevelLayoutManagerTest, Maximize) { | 58 TEST_F(ToplevelLayoutManagerTest, Maximize) { |
| 60 gfx::Rect bounds(100, 100, 200, 200); | 59 gfx::Rect bounds(100, 100, 200, 200); |
| 61 scoped_ptr<aura::Window> window(CreateTestWindow(bounds)); | 60 scoped_ptr<aura::Window> window(CreateTestWindow(bounds)); |
| 62 window->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_MAXIMIZED); | 61 window->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_MAXIMIZED); |
| 63 EXPECT_EQ(gfx::Screen::GetMonitorWorkAreaNearestWindow(window.get()), | 62 EXPECT_EQ(gfx::Screen::GetMonitorWorkAreaNearestWindow(window.get()), |
| 64 window->bounds()); | 63 window->bounds()); |
| 65 window->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_NORMAL); | 64 window->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_NORMAL); |
| 66 EXPECT_EQ(bounds, window->bounds()); | 65 EXPECT_EQ(bounds, window->bounds()); |
| 67 } | 66 } |
| 68 | 67 |
| 69 // Tests normal->fullscreen->normal. | 68 // Tests normal->fullscreen->normal. |
| 70 TEST_F(ToplevelLayoutManagerTest, Fullscreen) { | 69 TEST_F(ToplevelLayoutManagerTest, Fullscreen) { |
| 71 gfx::Rect bounds(100, 100, 200, 200); | 70 gfx::Rect bounds(100, 100, 200, 200); |
| 72 scoped_ptr<aura::Window> window(CreateTestWindow(bounds)); | 71 scoped_ptr<aura::Window> window(CreateTestWindow(bounds)); |
| 73 window->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_FULLSCREEN); | 72 window->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_FULLSCREEN); |
| 74 EXPECT_EQ(gfx::Screen::GetMonitorAreaNearestWindow(window.get()), | 73 EXPECT_EQ(gfx::Screen::GetMonitorAreaNearestWindow(window.get()), |
| 75 window->bounds()); | 74 window->bounds()); |
| 76 window->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_NORMAL); | 75 window->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_NORMAL); |
| 77 EXPECT_EQ(bounds, window->bounds()); | 76 EXPECT_EQ(bounds, window->bounds()); |
| 78 } | 77 } |
| 79 | 78 |
| 80 } // namespace aura_shell | 79 } // namespace aura_shell |
| OLD | NEW |