diff options
| author | falken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-24 08:30:37 +0000 |
|---|---|---|
| committer | falken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-24 08:30:37 +0000 |
| commit | 8cfcda7b408e004ecd88d0a4cb6bf2bf555c9ed0 (patch) | |
| tree | ede881196bb5c2e8208200084a6ee7d5ae26ac5b /ash/wm/drag_window_resizer.cc | |
| parent | 721f4bf74be7e316deb04fd5404e202d89088097 (diff) | |
| download | chromium_src-8cfcda7b408e004ecd88d0a4cb6bf2bf555c9ed0.zip chromium_src-8cfcda7b408e004ecd88d0a4cb6bf2bf555c9ed0.tar.gz chromium_src-8cfcda7b408e004ecd88d0a4cb6bf2bf555c9ed0.tar.bz2 | |
Revert 230671 "Avoid creating two resizers for two-finger drag. ..."
Reverting because it seems to break the following test on Linux Chromium OS:
TabDragging/DetachToBrowserTabDragControllerTestTouch.DetachToOwnWindowTwoFingers/0
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20(2)/builds/19110
> Avoid creating two resizers for two-finger drag. This CL is trying to avoid creating two separate WindowResizer instances that are now created in both ToplevelWindowEventHandler and TwoFingerDragHandler in the following scenario:
> [...]
> BUG=305730
> TEST=interactive_ui_tests --gtest_filter=*TabDragControllerTest*DetachToOwnWindowTwo*/1
> TEST=ash_unittests --gtest_filter=*SystemGestureEventFilterTest.TwoFingerDragDelayed*
> TEST=ash_unittests --gtest_filter=*SystemGestureEventFilterTest.ThreeFingerGestureStopsDrag*
>
> Review URL: https://codereview.chromium.org/28043002
TBR=varkha@chromium.org
Review URL: https://codereview.chromium.org/39653002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230681 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/drag_window_resizer.cc')
| -rw-r--r-- | ash/wm/drag_window_resizer.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ash/wm/drag_window_resizer.cc b/ash/wm/drag_window_resizer.cc index 002853a..92b8755 100644 --- a/ash/wm/drag_window_resizer.cc +++ b/ash/wm/drag_window_resizer.cc @@ -12,7 +12,6 @@ #include "ash/system/user/tray_user.h" #include "ash/wm/coordinate_conversion.h" #include "ash/wm/drag_window_controller.h" -#include "ash/wm/window_state.h" #include "base/memory/weak_ptr.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/env.h" @@ -54,8 +53,6 @@ aura::RootWindow* GetAnotherRootWindow(aura::RootWindow* root_window) { DragWindowResizer* DragWindowResizer::instance_ = NULL; DragWindowResizer::~DragWindowResizer() { - if (GetTarget()) - wm::GetWindowState(GetTarget())->set_window_resizer_(NULL); Shell* shell = Shell::GetInstance(); shell->mouse_cursor_filter()->set_mouse_warp_mode( MouseCursorEventFilter::WARP_ALWAYS); |