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

Unified Diff: ash/wm/drag_window_resizer.cc

Issue 115453004: Moves management of transients out of Window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove unneeded parens Created 6 years, 11 months 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 5b74fcb088405ef8fcb0440a4e023206a5b55194..2a859cff359b52f3aa0f699de7e1ecbef50d13be 100644
--- a/ash/wm/drag_window_resizer.cc
+++ b/ash/wm/drag_window_resizer.cc
@@ -22,6 +22,7 @@
#include "ui/base/hit_test.h"
#include "ui/base/ui_base_types.h"
#include "ui/gfx/screen.h"
+#include "ui/views/corewm/window_util.h"
namespace ash {
namespace internal {
@@ -232,9 +233,9 @@ void DragWindowResizer::UpdateDragWindow(const gfx::Rect& bounds,
bool DragWindowResizer::ShouldAllowMouseWarp() {
return (details_.window_component == HTCAPTION) &&
- !GetTarget()->transient_parent() &&
- (GetTarget()->type() == ui::wm::WINDOW_TYPE_NORMAL ||
- GetTarget()->type() == ui::wm::WINDOW_TYPE_PANEL);
+ !views::corewm::GetTransientParent(GetTarget()) &&
+ (GetTarget()->type() == ui::wm::WINDOW_TYPE_NORMAL ||
+ GetTarget()->type() == ui::wm::WINDOW_TYPE_PANEL);
}
TrayUser* DragWindowResizer::GetTrayUserItemAtPoint(
@@ -245,7 +246,7 @@ TrayUser* DragWindowResizer::GetTrayUserItemAtPoint(
// Check that this is a drag move operation from a suitable window.
if (details_.window_component != HTCAPTION ||
- GetTarget()->transient_parent() ||
+ views::corewm::GetTransientParent(GetTarget()) ||
(GetTarget()->type() != ui::wm::WINDOW_TYPE_NORMAL &&
GetTarget()->type() != ui::wm::WINDOW_TYPE_PANEL &&
GetTarget()->type() != ui::wm::WINDOW_TYPE_POPUP))
« 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