commit 52b02a76f71b14bd9623bf1581cb910b102e3ede
author sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Jan 08 21:41:50 2014
committer sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Jan 08 21:41:50 2014
tree d6203c6049d2c4448a786af777534511789b60f2
parent 43c1f53f555da045e68bb217f787ba49c08ba2bc

Makes Window::Init take a WindowLayerType instead of LayerType.

BUG=none
TEST=none
R=ben@chromium.org

Review URL: https://codereview.chromium.org/121773003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243656 0039d316-1c4b-4281-b951-d872f2087c98

ash/root_window_controller_unittest.cc

diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index fbbed69..ff01846 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -529,7 +529,7 @@
   window1->SetType(ui::wm::WINDOW_TYPE_CONTROL);
   window1->set_owned_by_parent(false);
   observer1.SetWindow(window1);
-  window1->Init(ui::LAYER_NOT_DRAWN);
+  window1->Init(aura::WINDOW_LAYER_NOT_DRAWN);
   aura::client::ParentWindowWithContext(
       window1, Shell::GetInstance()->GetPrimaryRootWindow(), gfx::Rect());
 
@@ -537,7 +537,7 @@
   aura::Window* window2 = new aura::Window(NULL);
   window2->set_owned_by_parent(false);
   observer2.SetWindow(window2);
-  window2->Init(ui::LAYER_NOT_DRAWN);
+  window2->Init(aura::WINDOW_LAYER_NOT_DRAWN);
   Shell::GetInstance()->GetPrimaryRootWindow()->AddChild(window2);
 
   Shell::GetInstance()->GetPrimaryRootWindowController()->CloseChildWindows();