summaryrefslogtreecommitdiffstats
path: root/ash/wm/drag_window_resizer.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-09 23:55:50 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-09 23:55:50 +0000
commitdf1e4fc94bda9ee5576b566aade733ccc53a9d3f (patch)
tree5ff9aac10140592feb825bf600109f3cd1e7c674 /ash/wm/drag_window_resizer.cc
parent98a4770f0f4c110fda6116b6b6846ee946d4c2c7 (diff)
downloadchromium_src-df1e4fc94bda9ee5576b566aade733ccc53a9d3f.zip
chromium_src-df1e4fc94bda9ee5576b566aade733ccc53a9d3f.tar.gz
chromium_src-df1e4fc94bda9ee5576b566aade733ccc53a9d3f.tar.bz2
Revert 243986 "Fix AdjustBoundsToEnsureWindowVisibility to work ..."
> Fix AdjustBoundsToEnsureWindowVisibility to work with non primary display bounds > This was asssuming that the visibile area has 0,0 origin. > > Move the code to ensure minimum visibility when added, from > WorkspaceLayoutManager to DragWindowResizer. > > BUG=none > TEST=WindowUtilTest.AdjustBoundsToEnsureWindowVisibility. > This also fixes the test that was failing. > TBR=oshima@chromium.org > > Review URL: https://codereview.chromium.org/106303005 TBR=oshima@chromium.org Review URL: https://codereview.chromium.org/131543006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244021 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/drag_window_resizer.cc')
-rw-r--r--ash/wm/drag_window_resizer.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/ash/wm/drag_window_resizer.cc b/ash/wm/drag_window_resizer.cc
index 835b204..2a859cf 100644
--- a/ash/wm/drag_window_resizer.cc
+++ b/ash/wm/drag_window_resizer.cc
@@ -13,7 +13,6 @@
#include "ash/wm/coordinate_conversion.h"
#include "ash/wm/drag_window_controller.h"
#include "ash/wm/window_state.h"
-#include "ash/wm/window_util.h"
#include "base/memory/weak_ptr.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/env.h"
@@ -150,9 +149,6 @@ void DragWindowResizer::CompleteDrag() {
dst_bounds.set_x(
last_mouse_location_in_screen.x() - dst_bounds.width());
}
- ash::wm::AdjustBoundsToEnsureMinimumWindowVisibility(
- dst_display.bounds(), &dst_bounds);
-
GetTarget()->SetBoundsInScreen(dst_bounds, dst_display);
}
}