| 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/default_container_layout_manager.h" | 5 #include "ui/aura_shell/default_container_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 "base/memory/scoped_vector.h" | 9 #include "base/memory/scoped_vector.h" |
| 10 #include "ui/aura/test/aura_test_base.h" | 10 #include "ui/aura/test/aura_test_base.h" |
| 11 #include "ui/aura/desktop.h" | 11 #include "ui/aura/desktop.h" |
| 12 #include "ui/aura/screen_aura.h" | 12 #include "ui/aura/screen_aura.h" |
| 13 #include "ui/aura/window.h" | 13 #include "ui/aura/window.h" |
| 14 #include "ui/aura_shell/workspace/workspace_controller.h" | 14 #include "ui/aura_shell/workspace/workspace_controller.h" |
| 15 #include "ui/base/view_prop.h" | |
| 16 #include "views/widget/native_widget_aura.h" | 15 #include "views/widget/native_widget_aura.h" |
| 17 | 16 |
| 18 namespace aura_shell { | 17 namespace aura_shell { |
| 19 namespace test { | 18 namespace test { |
| 20 | 19 |
| 21 namespace { | 20 namespace { |
| 22 | 21 |
| 23 using views::Widget; | 22 using views::Widget; |
| 24 using aura_shell::internal::DefaultContainerLayoutManager; | 23 using aura_shell::internal::DefaultContainerLayoutManager; |
| 25 | 24 |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 aura::Desktop::GetInstance()->AddTransientChild(window.get()); | 141 aura::Desktop::GetInstance()->AddTransientChild(window.get()); |
| 143 window->SetBounds(gfx::Rect(0, 0, 200, 200)); | 142 window->SetBounds(gfx::Rect(0, 0, 200, 200)); |
| 144 window->Show(); | 143 window->Show(); |
| 145 window->SetParent(container()); | 144 window->SetParent(container()); |
| 146 | 145 |
| 147 EXPECT_EQ("0,0 200x200", window->bounds().ToString()); | 146 EXPECT_EQ("0,0 200x200", window->bounds().ToString()); |
| 148 } | 147 } |
| 149 | 148 |
| 150 } // namespace test | 149 } // namespace test |
| 151 } // namespace aura_shell | 150 } // namespace aura_shell |
| OLD | NEW |