| 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/window_selector_controller.h" | 5 #include "ash/wm/overview/window_selector_controller.h" |
| 6 | 6 |
| 7 #include "ash/session_state_delegate.h" | 7 #include "ash/session_state_delegate.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/wm/mru_window_tracker.h" | 9 #include "ash/wm/mru_window_tracker.h" |
| 10 #include "ash/wm/window_selector.h" | 10 #include "ash/wm/overview/window_selector.h" |
| 11 #include "ash/wm/window_util.h" | 11 #include "ash/wm/window_util.h" |
| 12 #include "ui/base/events/event.h" | 12 #include "ui/base/events/event.h" |
| 13 #include "ui/base/events/event_handler.h" | 13 #include "ui/base/events/event_handler.h" |
| 14 | 14 |
| 15 namespace ash { | 15 namespace ash { |
| 16 | 16 |
| 17 namespace { | 17 namespace { |
| 18 | 18 |
| 19 // Filter to watch for the termination of a keyboard gesture to cycle through | 19 // Filter to watch for the termination of a keyboard gesture to cycle through |
| 20 // multiple windows. | 20 // multiple windows. |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 void WindowSelectorController::OnWindowSelected(aura::Window* window) { | 113 void WindowSelectorController::OnWindowSelected(aura::Window* window) { |
| 114 window_selector_.reset(); | 114 window_selector_.reset(); |
| 115 wm::ActivateWindow(window); | 115 wm::ActivateWindow(window); |
| 116 } | 116 } |
| 117 | 117 |
| 118 void WindowSelectorController::OnSelectionCanceled() { | 118 void WindowSelectorController::OnSelectionCanceled() { |
| 119 window_selector_.reset(); | 119 window_selector_.reset(); |
| 120 } | 120 } |
| 121 | 121 |
| 122 } // namespace ash | 122 } // namespace ash |
| OLD | NEW |