wm: public window_types.

ash/wm/dock/docked_window_layout_manager.cc

Index: ash/wm/dock/docked_window_layout_manager.cc
diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc
index 3298f05602fceab57d553833909fe8408ee21718..d59a14df9df731ead4ceee8fa4e2b001847cc36e 100644
--- a/ash/wm/dock/docked_window_layout_manager.cc
+++ b/ash/wm/dock/docked_window_layout_manager.cc
@@ -180,7 +180,7 @@ namespace {
 
 // Returns true if a window is a popup or a transient child.
 bool IsPopupOrTransient(const aura::Window* window) {
-  return (window->type() == aura::client::WINDOW_TYPE_POPUP ||
+  return (window->type() == ui::wm::WINDOW_TYPE_POPUP ||
           window->transient_parent());
 }
 
@@ -896,7 +896,7 @@ void DockedWindowLayoutManager::RecordUmaAction(DockedAction action,
     if (!IsUsedByLayout(window))
       continue;
     docked_visible_count++;
-    if (window->type() == aura::client::WINDOW_TYPE_PANEL)
+    if (window->type() == ui::wm::WINDOW_TYPE_PANEL)
       docked_panels_count++;
     const wm::WindowState* window_state = wm::GetWindowState(window);
     if (window_state->HasRestoreBounds()) {