| 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/common/session/session_state_delegate.h" | 9 #include "ash/common/session/session_state_delegate.h" |
| 10 #include "ash/common/wm/mru_window_tracker.h" |
| 10 #include "ash/common/wm/window_state.h" | 11 #include "ash/common/wm/window_state.h" |
| 11 #include "ash/common/wm_shell.h" | 12 #include "ash/common/wm_shell.h" |
| 12 #include "ash/common/wm_window.h" | 13 #include "ash/common/wm_window.h" |
| 13 #include "ash/shell.h" | 14 #include "ash/shell.h" |
| 14 #include "ash/system/tray/system_tray_delegate.h" | 15 #include "ash/system/tray/system_tray_delegate.h" |
| 15 #include "ash/wm/overview/window_selector.h" | 16 #include "ash/wm/overview/window_selector.h" |
| 16 #include "base/metrics/histogram.h" | 17 #include "base/metrics/histogram.h" |
| 17 | 18 |
| 18 namespace ash { | 19 namespace ash { |
| 19 | 20 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 37 } | 38 } |
| 38 | 39 |
| 39 void WindowSelectorController::ToggleOverview() { | 40 void WindowSelectorController::ToggleOverview() { |
| 40 if (IsSelecting()) { | 41 if (IsSelecting()) { |
| 41 OnSelectionEnded(); | 42 OnSelectionEnded(); |
| 42 } else { | 43 } else { |
| 43 // Don't start overview if window selection is not allowed. | 44 // Don't start overview if window selection is not allowed. |
| 44 if (!CanSelect()) | 45 if (!CanSelect()) |
| 45 return; | 46 return; |
| 46 | 47 |
| 47 std::vector<WmWindow*> windows = WmShell::Get()->GetMruWindowList(); | 48 std::vector<WmWindow*> windows = |
| 49 WmShell::Get()->GetMruWindowTracker()->BuildMruWindowList(); |
| 48 auto end = | 50 auto end = |
| 49 std::remove_if(windows.begin(), windows.end(), | 51 std::remove_if(windows.begin(), windows.end(), |
| 50 std::not1(std::ptr_fun(&WindowSelector::IsSelectable))); | 52 std::not1(std::ptr_fun(&WindowSelector::IsSelectable))); |
| 51 windows.resize(end - windows.begin()); | 53 windows.resize(end - windows.begin()); |
| 52 | 54 |
| 53 // Don't enter overview mode with no windows. | 55 // Don't enter overview mode with no windows. |
| 54 if (windows.empty()) | 56 if (windows.empty()) |
| 55 return; | 57 return; |
| 56 | 58 |
| 57 Shell::GetInstance()->OnOverviewModeStarting(); | 59 Shell::GetInstance()->OnOverviewModeStarting(); |
| (...skipping 23 matching lines...) Expand all Loading... |
| 81 | 83 |
| 82 void WindowSelectorController::OnSelectionStarted() { | 84 void WindowSelectorController::OnSelectionStarted() { |
| 83 if (!last_selection_time_.is_null()) { | 85 if (!last_selection_time_.is_null()) { |
| 84 UMA_HISTOGRAM_LONG_TIMES( | 86 UMA_HISTOGRAM_LONG_TIMES( |
| 85 "Ash.WindowSelector.TimeBetweenUse", | 87 "Ash.WindowSelector.TimeBetweenUse", |
| 86 base::Time::Now() - last_selection_time_); | 88 base::Time::Now() - last_selection_time_); |
| 87 } | 89 } |
| 88 } | 90 } |
| 89 | 91 |
| 90 } // namespace ash | 92 } // namespace ash |
| OLD | NEW |