| 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 "ui/aura/test/aura_test_base.h" | 5 #include "ui/aura/test/aura_test_base.h" |
| 6 | 6 |
| 7 #include "ui/aura/client/window_tree_client.h" | 7 #include "ui/aura/client/window_tree_client.h" |
| 8 #include "ui/aura/root_window.h" | 8 #include "ui/aura/root_window.h" |
| 9 #include "ui/aura/test/aura_test_helper.h" | 9 #include "ui/aura/test/aura_test_helper.h" |
| 10 #include "ui/aura/test/test_window_delegate.h" | 10 #include "ui/aura/test/test_window_delegate.h" |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 delegate ? delegate : | 90 delegate ? delegate : |
| 91 test::TestWindowDelegate::CreateSelfDestroyingDelegate()); | 91 test::TestWindowDelegate::CreateSelfDestroyingDelegate()); |
| 92 window->set_id(id); | 92 window->set_id(id); |
| 93 window->Init(ui::LAYER_TEXTURED); | 93 window->Init(ui::LAYER_TEXTURED); |
| 94 parent->AddChild(window); | 94 parent->AddChild(window); |
| 95 window->SetBounds(gfx::Rect(0, 0, 100, 100)); | 95 window->SetBounds(gfx::Rect(0, 0, 100, 100)); |
| 96 window->Show(); | 96 window->Show(); |
| 97 return window; | 97 return window; |
| 98 } | 98 } |
| 99 | 99 |
| 100 Window* AuraTestBase::CreateTransientChild(int id, Window* parent) { | |
| 101 Window* window = new Window(NULL); | |
| 102 window->set_id(id); | |
| 103 window->SetType(aura::client::WINDOW_TYPE_NORMAL); | |
| 104 window->Init(ui::LAYER_TEXTURED); | |
| 105 aura::client::ParentWindowWithContext(window, root_window(), gfx::Rect()); | |
| 106 parent->AddTransientChild(window); | |
| 107 return window; | |
| 108 } | |
| 109 | |
| 110 void AuraTestBase::RunAllPendingInMessageLoop() { | 100 void AuraTestBase::RunAllPendingInMessageLoop() { |
| 111 helper_->RunAllPendingInMessageLoop(); | 101 helper_->RunAllPendingInMessageLoop(); |
| 112 } | 102 } |
| 113 | 103 |
| 114 void AuraTestBase::ParentWindow(Window* window) { | 104 void AuraTestBase::ParentWindow(Window* window) { |
| 115 client::ParentWindowWithContext(window, root_window(), gfx::Rect()); | 105 client::ParentWindowWithContext(window, root_window(), gfx::Rect()); |
| 116 } | 106 } |
| 117 | 107 |
| 118 } // namespace test | 108 } // namespace test |
| 119 } // namespace aura | 109 } // namespace aura |
| OLD | NEW |