| Index: ui/aura/demo/demo_main.cc
|
| diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
|
| index 8e2fa11f6fb557ea324f53efdf40db3c9a41062b..3dcd7db3b0244853a2b49fed71d4c61b74c6cbf1 100644
|
| --- a/ui/aura/demo/demo_main.cc
|
| +++ b/ui/aura/demo/demo_main.cc
|
| @@ -126,7 +126,7 @@ int DemoMain() {
|
| DemoWindowDelegate window_delegate1(SK_ColorBLUE);
|
| aura::Window window1(&window_delegate1);
|
| window1.set_id(1);
|
| - window1.Init(ui::LAYER_TEXTURED);
|
| + window1.Init(aura::WINDOW_LAYER_TEXTURED);
|
| window1.SetBounds(gfx::Rect(100, 100, 400, 400));
|
| window1.Show();
|
| aura::client::ParentWindowWithContext(
|
| @@ -135,7 +135,7 @@ int DemoMain() {
|
| DemoWindowDelegate window_delegate2(SK_ColorRED);
|
| aura::Window window2(&window_delegate2);
|
| window2.set_id(2);
|
| - window2.Init(ui::LAYER_TEXTURED);
|
| + window2.Init(aura::WINDOW_LAYER_TEXTURED);
|
| window2.SetBounds(gfx::Rect(200, 200, 350, 350));
|
| window2.Show();
|
| aura::client::ParentWindowWithContext(
|
| @@ -144,7 +144,7 @@ int DemoMain() {
|
| DemoWindowDelegate window_delegate3(SK_ColorGREEN);
|
| aura::Window window3(&window_delegate3);
|
| window3.set_id(3);
|
| - window3.Init(ui::LAYER_TEXTURED);
|
| + window3.Init(aura::WINDOW_LAYER_TEXTURED);
|
| window3.SetBounds(gfx::Rect(10, 10, 50, 50));
|
| window3.Show();
|
| window2.AddChild(&window3);
|
|
|