wm: public window_types.

ui/views/corewm/shadow_controller_unittest.cc

Index: ui/views/corewm/shadow_controller_unittest.cc
diff --git a/ui/views/corewm/shadow_controller_unittest.cc b/ui/views/corewm/shadow_controller_unittest.cc
index 4140f7d83fb5bd38da9780a14f99bc1f2a3e7f0a..3d32d6af571a218b0f9214e9cd5c77d28f493e88 100644
--- a/ui/views/corewm/shadow_controller_unittest.cc
+++ b/ui/views/corewm/shadow_controller_unittest.cc
@@ -55,7 +55,7 @@ class ShadowControllerTest : public aura::test::AuraTestBase {
 // Tests that various methods in Window update the Shadow object as expected.
 TEST_F(ShadowControllerTest, Shadow) {
   scoped_ptr<aura::Window> window(new aura::Window(NULL));
-  window->SetType(aura::client::WINDOW_TYPE_NORMAL);
+  window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
   window->Init(ui::LAYER_TEXTURED);
   ParentWindow(window.get());
 
@@ -91,7 +91,7 @@ TEST_F(ShadowControllerTest, Shadow) {
 // Tests that the window's shadow's bounds are updated correctly.
 TEST_F(ShadowControllerTest, ShadowBounds) {
   scoped_ptr<aura::Window> window(new aura::Window(NULL));
-  window->SetType(aura::client::WINDOW_TYPE_NORMAL);
+  window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
   window->Init(ui::LAYER_TEXTURED);
   ParentWindow(window.get());
   window->Show();
@@ -120,7 +120,7 @@ TEST_F(ShadowControllerTest, ShadowStyle) {
   ShadowController::TestApi api(shadow_controller());
 
   scoped_ptr<aura::Window> window1(new aura::Window(NULL));
-  window1->SetType(aura::client::WINDOW_TYPE_NORMAL);
+  window1->SetType(ui::wm::WINDOW_TYPE_NORMAL);
   window1->Init(ui::LAYER_TEXTURED);
   ParentWindow(window1.get());
   window1->SetBounds(gfx::Rect(10, 20, 300, 400));
@@ -134,7 +134,7 @@ TEST_F(ShadowControllerTest, ShadowStyle) {
 
   // Create another window and activate it.
   scoped_ptr<aura::Window> window2(new aura::Window(NULL));
-  window2->SetType(aura::client::WINDOW_TYPE_NORMAL);
+  window2->SetType(ui::wm::WINDOW_TYPE_NORMAL);
   window2->Init(ui::LAYER_TEXTURED);
   ParentWindow(window2.get());
   window2->SetBounds(gfx::Rect(11, 21, 301, 401));
@@ -153,7 +153,7 @@ TEST_F(ShadowControllerTest, SmallShadowsForTooltipsAndMenus) {
   ShadowController::TestApi api(shadow_controller());
 
   scoped_ptr<aura::Window> tooltip_window(new aura::Window(NULL));
-  tooltip_window->SetType(aura::client::WINDOW_TYPE_TOOLTIP);
+  tooltip_window->SetType(ui::wm::WINDOW_TYPE_TOOLTIP);
   tooltip_window->Init(ui::LAYER_TEXTURED);
   ParentWindow(tooltip_window.get());
   tooltip_window->SetBounds(gfx::Rect(10, 20, 300, 400));
@@ -164,7 +164,7 @@ TEST_F(ShadowControllerTest, SmallShadowsForTooltipsAndMenus) {
   EXPECT_EQ(Shadow::STYLE_SMALL, tooltip_shadow->style());
 
   scoped_ptr<aura::Window> menu_window(new aura::Window(NULL));
-  menu_window->SetType(aura::client::WINDOW_TYPE_MENU);
+  menu_window->SetType(ui::wm::WINDOW_TYPE_MENU);
   menu_window->Init(ui::LAYER_TEXTURED);
   ParentWindow(menu_window.get());
   menu_window->SetBounds(gfx::Rect(10, 20, 300, 400));
@@ -181,7 +181,7 @@ TEST_F(ShadowControllerTest, TransientParentKeepsActiveShadow) {
   ShadowController::TestApi api(shadow_controller());
 
   scoped_ptr<aura::Window> window1(new aura::Window(NULL));
-  window1->SetType(aura::client::WINDOW_TYPE_NORMAL);
+  window1->SetType(ui::wm::WINDOW_TYPE_NORMAL);
   window1->Init(ui::LAYER_TEXTURED);
   ParentWindow(window1.get());
   window1->SetBounds(gfx::Rect(10, 20, 300, 400));
@@ -197,7 +197,7 @@ TEST_F(ShadowControllerTest, TransientParentKeepsActiveShadow) {
   // deactivate' property set. Upon activation, window1 should still have an
   // active shadow.
   scoped_ptr<aura::Window> window2(new aura::Window(NULL));
-  window2->SetType(aura::client::WINDOW_TYPE_NORMAL);
+  window2->SetType(ui::wm::WINDOW_TYPE_NORMAL);
   window2->Init(ui::LAYER_TEXTURED);
   ParentWindow(window2.get());
   window2->SetBounds(gfx::Rect(11, 21, 301, 401));