summaryrefslogtreecommitdiffstats
path: root/ash/wm/drag_window_resizer.cc
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-13 16:07:12 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-13 16:07:12 +0000
commit39dd9bc271d69d85d3189847b01e911d8ac7aeda (patch)
treefd3c3a40714a2b2dae82b2466517969138024d45 /ash/wm/drag_window_resizer.cc
parent9a6cfefacd9f3509fd3b85f453fb4e5dd1f001d7 (diff)
downloadchromium_src-39dd9bc271d69d85d3189847b01e911d8ac7aeda.zip
chromium_src-39dd9bc271d69d85d3189847b01e911d8ac7aeda.tar.gz
chromium_src-39dd9bc271d69d85d3189847b01e911d8ac7aeda.tar.bz2
Revert "Move wm/core to wm namespace."
This reverts commit 521c703f8d62fa698c3e88287c64d8d23f9ac675. Broke gyp BUG= Review URL: https://codereview.chromium.org/199263002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256846 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/drag_window_resizer.cc')
-rw-r--r--ash/wm/drag_window_resizer.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/wm/drag_window_resizer.cc b/ash/wm/drag_window_resizer.cc
index 2b91f85..1824e2b 100644
--- a/ash/wm/drag_window_resizer.cc
+++ b/ash/wm/drag_window_resizer.cc
@@ -206,7 +206,7 @@ void DragWindowResizer::UpdateDragWindow(const gfx::Rect& bounds,
bool DragWindowResizer::ShouldAllowMouseWarp() {
return (details().window_component == HTCAPTION) &&
- !::wm::GetTransientParent(GetTarget()) &&
+ !views::corewm::GetTransientParent(GetTarget()) &&
(GetTarget()->type() == ui::wm::WINDOW_TYPE_NORMAL ||
GetTarget()->type() == ui::wm::WINDOW_TYPE_PANEL);
}