diff options
| author | varkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 21:49:59 +0000 |
|---|---|---|
| committer | varkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 21:49:59 +0000 |
| commit | ba7df7e891565fb535731032b2cf292d6795dd79 (patch) | |
| tree | 87acb67a95a9cb993ffa4daae82d4d97c729fea5 /ash/wm | |
| parent | 187e0e38c25c2b5fbd72c58d5e0f8c082ba4f76a (diff) | |
| download | chromium_src-ba7df7e891565fb535731032b2cf292d6795dd79.zip chromium_src-ba7df7e891565fb535731032b2cf292d6795dd79.tar.gz chromium_src-ba7df7e891565fb535731032b2cf292d6795dd79.tar.bz2 | |
Add docking behavior experiment flags
BUG=233337
Review URL: https://chromiumcodereview.appspot.com/19706004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212443 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/workspace/workspace_window_resizer.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc index 3037e7c..0f498ce 100644 --- a/ash/wm/workspace/workspace_window_resizer.cc +++ b/ash/wm/workspace/workspace_window_resizer.cc @@ -110,7 +110,9 @@ const int kScreenEdgeInsetForTouchResize = 32; // Returns true if the window should stick to the edge. bool ShouldStickToEdge(int distance_from_edge, int sticky_size) { if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kAshEnableStickyEdges)) { + switches::kAshEnableStickyEdges) || + CommandLine::ForCurrentProcess()->HasSwitch( + switches::kAshEnableDockedWindows)) { return distance_from_edge < 0 && distance_from_edge > -sticky_size; } @@ -352,7 +354,9 @@ void WorkspaceWindowResizer::Drag(const gfx::Point& location_in_parent, if (event_flags & ui::EF_CONTROL_DOWN) { sticky_size = 0; } else if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kAshEnableStickyEdges)) { + switches::kAshEnableStickyEdges) || + CommandLine::ForCurrentProcess()->HasSwitch( + switches::kAshEnableDockedWindows)) { sticky_size = kStickyDistancePixels; } else if ((details_.bounds_change & kBoundsChange_Resizes) && details_.source == aura::client::WINDOW_MOVE_SOURCE_TOUCH) { |