| Index: ash/shelf/shelf_layout_manager_unittest.cc
|
| diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc
|
| index 0bfc295242f33c94b01b64b954d68f0b0510a55c..968be66f25f081c33887ecdf39963919bd965039 100644
|
| --- a/ash/shelf/shelf_layout_manager_unittest.cc
|
| +++ b/ash/shelf/shelf_layout_manager_unittest.cc
|
| @@ -331,7 +331,7 @@ class ShelfLayoutManagerTest : public ash::test::AshTestBase {
|
| aura::Window* window = new aura::Window(NULL);
|
| window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
|
| window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
|
| - window->Init(aura::WINDOW_LAYER_TEXTURED);
|
| + window->Init(ui::LAYER_TEXTURED);
|
| ParentWindowInPrimaryRootWindow(window);
|
| return window;
|
| }
|
| @@ -340,7 +340,7 @@ class ShelfLayoutManagerTest : public ash::test::AshTestBase {
|
| aura::Window* window = new aura::Window(NULL);
|
| window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
|
| window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
|
| - window->Init(aura::WINDOW_LAYER_TEXTURED);
|
| + window->Init(ui::LAYER_TEXTURED);
|
| aura::client::ParentWindowWithContext(window, root_window, gfx::Rect());
|
| return window;
|
| }
|
|
|