| Index: ash/wm/drag_window_resizer.cc
|
| diff --git a/ash/wm/drag_window_resizer.cc b/ash/wm/drag_window_resizer.cc
|
| index a524d672181037413c934f859d7799d0526d4888..b2644d4fb387a959276073d245a0af64f6a02496 100644
|
| --- a/ash/wm/drag_window_resizer.cc
|
| +++ b/ash/wm/drag_window_resizer.cc
|
| @@ -232,9 +232,9 @@ void DragWindowResizer::UpdateDragWindow(const gfx::Rect& bounds,
|
|
|
| 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(
|
| @@ -246,9 +246,9 @@ TrayUser* DragWindowResizer::GetTrayUserItemAtPoint(
|
| // 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.
|
|
|