summaryrefslogtreecommitdiffstats
path: root/ash/wm/gestures
diff options
context:
space:
mode:
authormazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 21:18:21 +0000
committermazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 21:18:21 +0000
commitc38f941e61d37be52f5527c82312a7d5cd473674 (patch)
tree67e9215708116a469e403330a4510d8a8d5f1ecc /ash/wm/gestures
parent793202cbba51adb7f7a72af9f28245ab82a8daa3 (diff)
downloadchromium_src-c38f941e61d37be52f5527c82312a7d5cd473674.zip
chromium_src-c38f941e61d37be52f5527c82312a7d5cd473674.tar.gz
chromium_src-c38f941e61d37be52f5527c82312a7d5cd473674.tar.bz2
Extract the code of showing a dragging window on another display from PhantomWindowController.
PhantomWindowController shows two styles of window, STYLE_SHADOW and STYLE_DRAGGING. Although STYLE_SHADOW is specific to workspace, STYLE_DRAGGING is not specific to workspace. This CL separates this feature into two classes so that the STYLE_DRAGGING part can be used from non-workspace specific code - Extract the STYLE_DRAGGING part from PhantomWindowController into DragWindowController. - Move the ownership of the copied window layer from WorkspaceWindowResizer to DragWindowController. BUG=156519 Review URL: https://chromiumcodereview.appspot.com/11280283 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/gestures')
-rw-r--r--ash/wm/gestures/system_pinch_handler.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/wm/gestures/system_pinch_handler.cc b/ash/wm/gestures/system_pinch_handler.cc
index b95adc8..806f4f9 100644
--- a/ash/wm/gestures/system_pinch_handler.cc
+++ b/ash/wm/gestures/system_pinch_handler.cc
@@ -73,7 +73,7 @@ SystemGestureStatus SystemPinchHandler::ProcessGestureEvent(
gfx::Rect bounds =
GetPhantomWindowScreenBounds(target_, event.location());
if (phantom_state_ != PHANTOM_WINDOW_NORMAL || phantom_.IsShowing())
- phantom_.Show(bounds, NULL);
+ phantom_.Show(bounds);
break;
}