OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/wm/overview/window_selector_controller.h" | 5 #include "ash/wm/overview/window_selector_controller.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
| 9 #include "ash/ash_switches.h" |
9 #include "ash/metrics/user_metrics_recorder.h" | 10 #include "ash/metrics/user_metrics_recorder.h" |
10 #include "ash/root_window_controller.h" | 11 #include "ash/root_window_controller.h" |
11 #include "ash/session/session_state_delegate.h" | 12 #include "ash/session/session_state_delegate.h" |
12 #include "ash/shell.h" | 13 #include "ash/shell.h" |
13 #include "ash/system/tray/system_tray_delegate.h" | 14 #include "ash/system/tray/system_tray_delegate.h" |
14 #include "ash/wm/mru_window_tracker.h" | 15 #include "ash/wm/mru_window_tracker.h" |
15 #include "ash/wm/overview/window_selector.h" | 16 #include "ash/wm/overview/window_selector.h" |
16 #include "ash/wm/window_state.h" | 17 #include "ash/wm/window_state.h" |
17 #include "ash/wm/window_util.h" | 18 #include "ash/wm/window_util.h" |
| 19 #include "base/command_line.h" |
18 #include "base/metrics/histogram.h" | 20 #include "base/metrics/histogram.h" |
19 #include "ui/aura/window.h" | 21 #include "ui/aura/window.h" |
20 | 22 |
21 namespace ash { | 23 namespace ash { |
22 | 24 |
23 WindowSelectorController::WindowSelectorController() { | 25 WindowSelectorController::WindowSelectorController() |
| 26 : swipe_to_close_disabled_(base::CommandLine::ForCurrentProcess()-> |
| 27 HasSwitch(switches::kAshDisableSwipeToCloseInOverviewMode)) { |
24 } | 28 } |
25 | 29 |
26 WindowSelectorController::~WindowSelectorController() { | 30 WindowSelectorController::~WindowSelectorController() { |
27 } | 31 } |
28 | 32 |
29 // static | 33 // static |
30 bool WindowSelectorController::CanSelect() { | 34 bool WindowSelectorController::CanSelect() { |
31 // Don't allow a window overview if the screen is locked or a modal dialog is | 35 // Don't allow a window overview if the screen is locked or a modal dialog is |
32 // open or running in kiosk app session. | 36 // open or running in kiosk app session. |
33 return Shell::GetInstance()->session_state_delegate()-> | 37 return Shell::GetInstance()->session_state_delegate()-> |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 | 83 |
80 void WindowSelectorController::OnSelectionStarted() { | 84 void WindowSelectorController::OnSelectionStarted() { |
81 if (!last_selection_time_.is_null()) { | 85 if (!last_selection_time_.is_null()) { |
82 UMA_HISTOGRAM_LONG_TIMES( | 86 UMA_HISTOGRAM_LONG_TIMES( |
83 "Ash.WindowSelector.TimeBetweenUse", | 87 "Ash.WindowSelector.TimeBetweenUse", |
84 base::Time::Now() - last_selection_time_); | 88 base::Time::Now() - last_selection_time_); |
85 } | 89 } |
86 } | 90 } |
87 | 91 |
88 } // namespace ash | 92 } // namespace ash |
OLD | NEW |