| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/aura/wm_shell_aura.h" | 5 #include "ash/aura/wm_shell_aura.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/aura/wm_window_aura.h" | 9 #include "ash/aura/wm_window_aura.h" |
| 10 #include "ash/common/session/session_state_delegate.h" | 10 #include "ash/common/session/session_state_delegate.h" |
| 11 #include "ash/common/shell_delegate.h" | 11 #include "ash/common/shell_delegate.h" |
| 12 #include "ash/common/shell_observer.h" | 12 #include "ash/common/shell_observer.h" |
| 13 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard
.h" | 13 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard
.h" |
| 14 #include "ash/common/wm/mru_window_tracker.h" | 14 #include "ash/common/wm/mru_window_tracker.h" |
| 15 #include "ash/common/wm/overview/window_selector_controller.h" | 15 #include "ash/common/wm/overview/window_selector_controller.h" |
| 16 #include "ash/common/wm_activation_observer.h" | 16 #include "ash/common/wm_activation_observer.h" |
| 17 #include "ash/common/wm_display_observer.h" | 17 #include "ash/common/wm_display_observer.h" |
| 18 #include "ash/display/display_manager.h" | 18 #include "ash/display/display_manager.h" |
| 19 #include "ash/display/window_tree_host_manager.h" | 19 #include "ash/display/window_tree_host_manager.h" |
| 20 #include "ash/metrics/task_switch_metrics_recorder.h" |
| 20 #include "ash/shell.h" | 21 #include "ash/shell.h" |
| 21 #include "ash/wm/drag_window_resizer.h" | 22 #include "ash/wm/drag_window_resizer.h" |
| 22 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h" | 23 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h" |
| 23 #include "ash/wm/screen_pinning_controller.h" | 24 #include "ash/wm/screen_pinning_controller.h" |
| 24 #include "ash/wm/window_util.h" | 25 #include "ash/wm/window_util.h" |
| 25 #include "base/memory/ptr_util.h" | 26 #include "base/memory/ptr_util.h" |
| 26 #include "ui/aura/client/focus_client.h" | 27 #include "ui/aura/client/focus_client.h" |
| 27 #include "ui/wm/public/activation_client.h" | 28 #include "ui/wm/public/activation_client.h" |
| 28 | 29 |
| 29 #if defined(OS_CHROMEOS) | 30 #if defined(OS_CHROMEOS) |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 | 125 |
| 125 std::vector<WmWindow*> WmShellAura::GetAllRootWindows() { | 126 std::vector<WmWindow*> WmShellAura::GetAllRootWindows() { |
| 126 aura::Window::Windows root_windows = Shell::GetAllRootWindows(); | 127 aura::Window::Windows root_windows = Shell::GetAllRootWindows(); |
| 127 std::vector<WmWindow*> wm_windows(root_windows.size()); | 128 std::vector<WmWindow*> wm_windows(root_windows.size()); |
| 128 for (size_t i = 0; i < root_windows.size(); ++i) | 129 for (size_t i = 0; i < root_windows.size(); ++i) |
| 129 wm_windows[i] = WmWindowAura::Get(root_windows[i]); | 130 wm_windows[i] = WmWindowAura::Get(root_windows[i]); |
| 130 return wm_windows; | 131 return wm_windows; |
| 131 } | 132 } |
| 132 | 133 |
| 133 void WmShellAura::RecordUserMetricsAction(UserMetricsAction action) { | 134 void WmShellAura::RecordUserMetricsAction(UserMetricsAction action) { |
| 134 return Shell::GetInstance()->metrics()->RecordUserMetricsAction(action); | 135 Shell::GetInstance()->metrics()->RecordUserMetricsAction(action); |
| 136 } |
| 137 |
| 138 void WmShellAura::RecordTaskSwitchMetric(TaskSwitchSource source) { |
| 139 Shell::GetInstance()->metrics()->task_switch_metrics_recorder().OnTaskSwitch( |
| 140 source); |
| 135 } | 141 } |
| 136 | 142 |
| 137 std::unique_ptr<WindowResizer> WmShellAura::CreateDragWindowResizer( | 143 std::unique_ptr<WindowResizer> WmShellAura::CreateDragWindowResizer( |
| 138 std::unique_ptr<WindowResizer> next_window_resizer, | 144 std::unique_ptr<WindowResizer> next_window_resizer, |
| 139 wm::WindowState* window_state) { | 145 wm::WindowState* window_state) { |
| 140 return base::WrapUnique( | 146 return base::WrapUnique( |
| 141 DragWindowResizer::Create(next_window_resizer.release(), window_state)); | 147 DragWindowResizer::Create(next_window_resizer.release(), window_state)); |
| 142 } | 148 } |
| 143 | 149 |
| 144 std::unique_ptr<wm::MaximizeModeEventHandler> | 150 std::unique_ptr<wm::MaximizeModeEventHandler> |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 236 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
| 231 OnDisplayConfigurationChanging()); | 237 OnDisplayConfigurationChanging()); |
| 232 } | 238 } |
| 233 | 239 |
| 234 void WmShellAura::OnDisplayConfigurationChanged() { | 240 void WmShellAura::OnDisplayConfigurationChanged() { |
| 235 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 241 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
| 236 OnDisplayConfigurationChanged()); | 242 OnDisplayConfigurationChanged()); |
| 237 } | 243 } |
| 238 | 244 |
| 239 } // namespace ash | 245 } // namespace ash |
| OLD | NEW |