Index: ui/aura/window_unittest.cc |
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc |
index 79a6e180d3e1e64fbd76786050a807de9b9d2004..eee7444623a836779506b0f49f0a606897a26f32 100644 |
--- a/ui/aura/window_unittest.cc |
+++ b/ui/aura/window_unittest.cc |
@@ -180,7 +180,8 @@ class WindowTest : public AuraTestBase { |
Window* parent) { |
Window* window = new Window(delegate); |
window->set_id(id); |
- window->Init(ui::Layer::LAYER_HAS_TEXTURE); |
+ window->Init(ui::Layer::LAYER_HAS_TEXTURE, |
+ Window::LAYER_INITIALLY_INVISIBLE); |
window->SetBounds(bounds); |
window->Show(); |
window->SetParent(parent); |
@@ -207,7 +208,7 @@ TEST_F(WindowTest, GetChildById) { |
TEST_F(WindowTest, HitTest) { |
Window w1(new ColorTestWindowDelegate(SK_ColorWHITE)); |
w1.set_id(1); |
- w1.Init(ui::Layer::LAYER_HAS_TEXTURE); |
+ w1.Init(ui::Layer::LAYER_HAS_TEXTURE, Window::LAYER_INITIALLY_INVISIBLE); |
w1.SetBounds(gfx::Rect(10, 10, 50, 50)); |
w1.Show(); |
w1.SetParent(NULL); |
@@ -357,11 +358,14 @@ TEST_F(WindowTest, DestroyTest) { |
// Make sure MoveChildToFront moves both the window and layer to the front. |
TEST_F(WindowTest, MoveChildToFront) { |
Window parent(NULL); |
- parent.Init(ui::Layer::LAYER_HAS_NO_TEXTURE); |
+ parent.Init(ui::Layer::LAYER_HAS_NO_TEXTURE, |
+ Window::LAYER_INITIALLY_INVISIBLE); |
Window child1(NULL); |
- child1.Init(ui::Layer::LAYER_HAS_NO_TEXTURE); |
+ child1.Init(ui::Layer::LAYER_HAS_NO_TEXTURE, |
+ Window::LAYER_INITIALLY_INVISIBLE); |
Window child2(NULL); |
- child2.Init(ui::Layer::LAYER_HAS_NO_TEXTURE); |
+ child2.Init(ui::Layer::LAYER_HAS_NO_TEXTURE, |
+ Window::LAYER_INITIALLY_INVISIBLE); |
child1.SetParent(&parent); |
child2.SetParent(&parent); |
@@ -1054,7 +1058,8 @@ class ToplevelWindowTest : public WindowTest { |
virtual void SetUp() OVERRIDE { |
WindowTest::SetUp(); |
- toplevel_container_.Init(ui::Layer::LAYER_HAS_NO_TEXTURE); |
+ toplevel_container_.Init(ui::Layer::LAYER_HAS_NO_TEXTURE, |
+ Window::LAYER_INITIALLY_INVISIBLE); |
toplevel_container_.SetParent(aura::Desktop::GetInstance()); |
toplevel_container_.SetBounds( |
aura::Desktop::GetInstance()->bounds()); |