Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(253)

Unified Diff: ash/wm/drag_window_resizer.cc

Issue 115153002: wm: public window_types. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ozone deps Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/dock/docked_window_resizer_unittest.cc ('k') | ash/wm/drag_window_resizer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « ash/wm/dock/docked_window_resizer_unittest.cc ('k') | ash/wm/drag_window_resizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698