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

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: 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
Index: ash/wm/drag_window_resizer.cc
diff --git a/ash/wm/drag_window_resizer.cc b/ash/wm/drag_window_resizer.cc
index 000d1198419d9d40656f89f97839ebf1bb8813e3..561917115a330db22d1d9a311d9362e54542982f 100644
--- a/ash/wm/drag_window_resizer.cc
+++ b/ash/wm/drag_window_resizer.cc
@@ -212,9 +212,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(
@@ -226,9 +226,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.

Powered by Google App Engine
This is Rietveld 408576698