| 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/toplevel_layout_manager.h" | 5 #include "ash/wm/toplevel_layout_manager.h" |
| 6 | 6 |
| 7 #include "ash/wm/shelf_layout_manager.h" | 7 #include "ash/wm/shelf_layout_manager.h" |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "ui/aura/client/aura_constants.h" | 10 #include "ui/aura/client/aura_constants.h" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 internal::ToplevelLayoutManager* layout_manager() { | 28 internal::ToplevelLayoutManager* layout_manager() { |
| 29 return layout_manager_; | 29 return layout_manager_; |
| 30 } | 30 } |
| 31 | 31 |
| 32 virtual void SetUp() OVERRIDE { | 32 virtual void SetUp() OVERRIDE { |
| 33 aura::test::AuraTestBase::SetUp(); | 33 aura::test::AuraTestBase::SetUp(); |
| 34 aura::RootWindow::GetInstance()->screen()->set_work_area_insets( | 34 aura::RootWindow::GetInstance()->screen()->set_work_area_insets( |
| 35 gfx::Insets(1, 2, 3, 4)); | 35 gfx::Insets(1, 2, 3, 4)); |
| 36 aura::RootWindow::GetInstance()->SetHostSize(gfx::Size(800, 600)); | 36 aura::RootWindow::GetInstance()->SetHostSize(gfx::Size(800, 600)); |
| 37 container_.reset(new aura::Window(NULL)); | 37 container_.reset(new aura::Window(NULL)); |
| 38 container_->Init(ui::Layer::LAYER_HAS_NO_TEXTURE); | 38 container_->Init(ui::Layer::LAYER_NOT_DRAWN); |
| 39 container_->SetBounds(gfx::Rect(0, 0, 500, 500)); | 39 container_->SetBounds(gfx::Rect(0, 0, 500, 500)); |
| 40 layout_manager_ = new internal::ToplevelLayoutManager(); | 40 layout_manager_ = new internal::ToplevelLayoutManager(); |
| 41 container_->SetLayoutManager(layout_manager_); | 41 container_->SetLayoutManager(layout_manager_); |
| 42 } | 42 } |
| 43 | 43 |
| 44 aura::Window* CreateTestWindow(const gfx::Rect& bounds) { | 44 aura::Window* CreateTestWindow(const gfx::Rect& bounds) { |
| 45 return aura::test::CreateTestWindowWithBounds(bounds, container_.get()); | 45 return aura::test::CreateTestWindowWithBounds(bounds, container_.get()); |
| 46 } | 46 } |
| 47 | 47 |
| 48 // Returns widget owned by its parent, so doesn't need scoped_ptr<>. | 48 // Returns widget owned by its parent, so doesn't need scoped_ptr<>. |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 EXPECT_TRUE(shelf_layout_manager.get()->visible()); | 199 EXPECT_TRUE(shelf_layout_manager.get()->visible()); |
| 200 // Window depends on layout manager for cleanup. | 200 // Window depends on layout manager for cleanup. |
| 201 window.reset(); | 201 window.reset(); |
| 202 // shelf_layout_manager is observing these animations so clean them up first. | 202 // shelf_layout_manager is observing these animations so clean them up first. |
| 203 launcher->GetNativeView()->layer()->GetAnimator()->StopAnimating(); | 203 launcher->GetNativeView()->layer()->GetAnimator()->StopAnimating(); |
| 204 status->GetNativeView()->layer()->GetAnimator()->StopAnimating(); | 204 status->GetNativeView()->layer()->GetAnimator()->StopAnimating(); |
| 205 shelf_layout_manager.reset(); | 205 shelf_layout_manager.reset(); |
| 206 } | 206 } |
| 207 | 207 |
| 208 } // namespace ash | 208 } // namespace ash |
| OLD | NEW |