diff options
| author | bruthig <bruthig@chromium.org> | 2015-02-13 07:13:52 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-13 15:14:41 +0000 |
| commit | 7ec5114efa5eada853c2ece5d6edb0fa4ce5611a (patch) | |
| tree | a2ac273507cfec0d24575e2e233d8fd5b01f107c /ash/wm/overview/window_selector_controller.cc | |
| parent | da598af72344cb67f04108e80415372bed7cea66 (diff) | |
| download | chromium_src-7ec5114efa5eada853c2ece5d6edb0fa4ce5611a.zip chromium_src-7ec5114efa5eada853c2ece5d6edb0fa4ce5611a.tar.gz chromium_src-7ec5114efa5eada853c2ece5d6edb0fa4ce5611a.tar.bz2 | |
Implemented swipe to close in overview mode.
BUG=393668
Review URL: https://codereview.chromium.org/690103008
Cr-Commit-Position: refs/heads/master@{#316217}
Diffstat (limited to 'ash/wm/overview/window_selector_controller.cc')
| -rw-r--r-- | ash/wm/overview/window_selector_controller.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ash/wm/overview/window_selector_controller.cc b/ash/wm/overview/window_selector_controller.cc index df14d27..69ad590 100644 --- a/ash/wm/overview/window_selector_controller.cc +++ b/ash/wm/overview/window_selector_controller.cc @@ -6,6 +6,7 @@ #include <vector> +#include "ash/ash_switches.h" #include "ash/metrics/user_metrics_recorder.h" #include "ash/root_window_controller.h" #include "ash/session/session_state_delegate.h" @@ -15,12 +16,15 @@ #include "ash/wm/overview/window_selector.h" #include "ash/wm/window_state.h" #include "ash/wm/window_util.h" +#include "base/command_line.h" #include "base/metrics/histogram.h" #include "ui/aura/window.h" namespace ash { -WindowSelectorController::WindowSelectorController() { +WindowSelectorController::WindowSelectorController() + : swipe_to_close_disabled_(base::CommandLine::ForCurrentProcess()-> + HasSwitch(switches::kAshDisableSwipeToCloseInOverviewMode)) { } WindowSelectorController::~WindowSelectorController() { |