wm: public window_types.

ash/wm/drag_window_resizer.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/drag_window_resizer.h"
 
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
@@ skipping 194 matching lines @@
     drag_window_controller_->SetOpacity(phantom_opacity);
     GetTarget()->layer()->SetOpacity(window_opacity);
   } else {
     drag_window_controller_.reset();
     GetTarget()->layer()->SetOpacity(1.0f);
   }
 }
 
 bool DragWindowResizer::ShouldAllowMouseWarp() {
   return (details_.window_component == HTCAPTION) &&
-      !GetTarget()->transient_parent() &&
-      (GetTarget()->type() == aura::client::WINDOW_TYPE_NORMAL ||
-       GetTarget()->type() == aura::client::WINDOW_TYPE_PANEL);
+         !GetTarget()->transient_parent() &&
+         (GetTarget()->type() == ui::wm::WINDOW_TYPE_NORMAL ||
+          GetTarget()->type() == ui::wm::WINDOW_TYPE_PANEL);
 }
 
 TrayUser* DragWindowResizer::GetTrayUserItemAtPoint(
     const gfx::Point& point_in_screen) {
   // Unit tests might not have an ash shell.
   if (!ash::Shell::GetInstance())
     return NULL;
 
   // Check that this is a drag move operation from a suitable window.
   if (details_.window_component != HTCAPTION ||
       GetTarget()->transient_parent() ||
-      (GetTarget()->type() != aura::client::WINDOW_TYPE_NORMAL &&
-       GetTarget()->type() != aura::client::WINDOW_TYPE_PANEL &&
-       GetTarget()->type() != aura::client::WINDOW_TYPE_POPUP))
+      (GetTarget()->type() != ui::wm::WINDOW_TYPE_NORMAL &&
+       GetTarget()->type() != ui::wm::WINDOW_TYPE_PANEL &&
+       GetTarget()->type() != ui::wm::WINDOW_TYPE_POPUP))
     return NULL;
 
   // We only allow to drag the window onto a tray of it's own RootWindow.
   SystemTray* tray = internal::GetRootWindowController(
       details_.window->GetRootWindow())->GetSystemTray();
 
   // Again - unit tests might not have a tray.
   if (!tray)
     return NULL;
 
@@ skipping 26 matching lines @@
   if (!tray_user->TransferWindowToUser(details_.window)) {
     GetTarget()->layer()->SetOpacity(old_opacity);
     return false;
   }
   RevertDrag();
   return true;
 }
 
 }  // namespace internal
 }  // namespace ash