wm: public window_types.

ash/test/test_shelf_delegate.cc

 // Copyright 2013 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/test/test_shelf_delegate.h"
 
 #include "ash/shelf/shelf_item_delegate_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
@@ skipping 18 matching lines @@
   instance_ = NULL;
 }
 
 void TestShelfDelegate::AddLauncherItem(aura::Window* window) {
   AddLauncherItem(window, STATUS_CLOSED);
 }
 
 void TestShelfDelegate::AddLauncherItem(aura::Window* window,
                                         LauncherItemStatus status) {
   LauncherItem item;
-  if (window->type() == aura::client::WINDOW_TYPE_PANEL)
+  if (window->type() == ui::wm::WINDOW_TYPE_PANEL)
     item.type = TYPE_APP_PANEL;
   else
     item.type = TYPE_PLATFORM_APP;
   LauncherID id = model_->next_id();
   item.status = status;
   model_->Add(item);
   window->AddObserver(this);
 
   ShelfItemDelegateManager* manager =
       Shell::GetInstance()->shelf_item_delegate_manager();
@@ skipping 49 matching lines @@
 
 bool TestShelfDelegate::IsAppPinned(const std::string& app_id) {
   return false;
 }
 
 void TestShelfDelegate::UnpinAppWithID(const std::string& app_id) {
 }
 
 }  // namespace test
 }  // namespace ash