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/test/test_windows.h" | 5 #include "ui/aura/test/test_windows.h" |
6 | 6 |
7 #include "ui/aura/window.h" | 7 #include "ui/aura/window.h" |
8 #include "ui/gfx/compositor/layer.h" | 8 #include "ui/gfx/compositor/layer.h" |
9 #include "ui/gfx/rect.h" | 9 #include "ui/gfx/rect.h" |
10 | 10 |
(...skipping 29 matching lines...) Expand all Loading... |
40 } | 40 } |
41 | 41 |
42 Window* CreateTestWindowWithDelegateAndType(WindowDelegate* delegate, | 42 Window* CreateTestWindowWithDelegateAndType(WindowDelegate* delegate, |
43 client::WindowType type, | 43 client::WindowType type, |
44 int id, | 44 int id, |
45 const gfx::Rect& bounds, | 45 const gfx::Rect& bounds, |
46 Window* parent) { | 46 Window* parent) { |
47 Window* window = new Window(delegate); | 47 Window* window = new Window(delegate); |
48 window->set_id(id); | 48 window->set_id(id); |
49 window->SetType(type); | 49 window->SetType(type); |
50 window->Init(ui::Layer::LAYER_HAS_TEXTURE); | 50 window->Init(ui::Layer::LAYER_TEXTURED); |
51 window->SetBounds(bounds); | 51 window->SetBounds(bounds); |
52 window->Show(); | 52 window->Show(); |
53 window->SetParent(parent); | 53 window->SetParent(parent); |
54 return window; | 54 return window; |
55 } | 55 } |
56 | 56 |
57 } // namespace test | 57 } // namespace test |
58 } // namespace aura | 58 } // namespace aura |
OLD | NEW |