wm: public window_types.

ash/wm/panels/panel_layout_manager_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/panels/panel_layout_manager.h"
 
 #include "ash/ash_switches.h"
 #include "ash/launcher/launcher.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
@@ skipping 45 matching lines @@
         GetShelfView(Launcher::ForPrimaryDisplay())));
     shelf_view_test_->SetAnimationDuration(1);
   }
 
   aura::Window* CreateNormalWindow(const gfx::Rect& bounds) {
     return CreateTestWindowInShellWithBounds(bounds);
   }
 
   aura::Window* CreatePanelWindow(const gfx::Rect& bounds) {
     aura::Window* window = CreateTestWindowInShellWithDelegateAndType(
-        NULL,
-        aura::client::WINDOW_TYPE_PANEL,
-        0,
-        bounds);
+        NULL, ui::wm::WINDOW_TYPE_PANEL, 0, bounds);
     test::TestShelfDelegate* shelf_delegate =
         test::TestShelfDelegate::instance();
     shelf_delegate->AddLauncherItem(window);
     PanelLayoutManager* manager = static_cast<PanelLayoutManager*>(
         GetPanelContainer(window)->layout_manager());
     manager->Relayout();
     shelf_view_test()->RunMessageLoopUntilAnimationsDone();
     return window;
   }
 
@@ skipping 711 matching lines @@
   EXPECT_TRUE(w1->IsVisible());
   EXPECT_FALSE(w2->IsVisible());
   EXPECT_TRUE(w3->IsVisible());
 }
 
 INSTANTIATE_TEST_CASE_P(LtrRtl, PanelLayoutManagerTextDirectionTest,
                         testing::Bool());
 
 }  // namespace internal
 }  // namespace ash