| 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/metrics/task_switch_metrics_recorder.h" |
| 21 #include "ash/shell.h" | 21 #include "ash/shell.h" |
| 22 #include "ash/touch/touch_uma.h" |
| 22 #include "ash/wm/drag_window_resizer.h" | 23 #include "ash/wm/drag_window_resizer.h" |
| 23 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h" | 24 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h" |
| 24 #include "ash/wm/screen_pinning_controller.h" | 25 #include "ash/wm/screen_pinning_controller.h" |
| 25 #include "ash/wm/window_cycle_event_filter_aura.h" | 26 #include "ash/wm/window_cycle_event_filter_aura.h" |
| 26 #include "ash/wm/window_util.h" | 27 #include "ash/wm/window_util.h" |
| 27 #include "base/memory/ptr_util.h" | 28 #include "base/memory/ptr_util.h" |
| 28 #include "ui/aura/client/focus_client.h" | 29 #include "ui/aura/client/focus_client.h" |
| 29 #include "ui/aura/env.h" | 30 #include "ui/aura/env.h" |
| 30 #include "ui/wm/public/activation_client.h" | 31 #include "ui/wm/public/activation_client.h" |
| 31 | 32 |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 std::vector<WmWindow*> wm_windows(root_windows.size()); | 127 std::vector<WmWindow*> wm_windows(root_windows.size()); |
| 127 for (size_t i = 0; i < root_windows.size(); ++i) | 128 for (size_t i = 0; i < root_windows.size(); ++i) |
| 128 wm_windows[i] = WmWindowAura::Get(root_windows[i]); | 129 wm_windows[i] = WmWindowAura::Get(root_windows[i]); |
| 129 return wm_windows; | 130 return wm_windows; |
| 130 } | 131 } |
| 131 | 132 |
| 132 void WmShellAura::RecordUserMetricsAction(UserMetricsAction action) { | 133 void WmShellAura::RecordUserMetricsAction(UserMetricsAction action) { |
| 133 Shell::GetInstance()->metrics()->RecordUserMetricsAction(action); | 134 Shell::GetInstance()->metrics()->RecordUserMetricsAction(action); |
| 134 } | 135 } |
| 135 | 136 |
| 137 void WmShellAura::RecordGestureAction(GestureActionType action) { |
| 138 TouchUMA::GetInstance()->RecordGestureAction(action); |
| 139 } |
| 140 |
| 136 void WmShellAura::RecordTaskSwitchMetric(TaskSwitchSource source) { | 141 void WmShellAura::RecordTaskSwitchMetric(TaskSwitchSource source) { |
| 137 Shell::GetInstance()->metrics()->task_switch_metrics_recorder().OnTaskSwitch( | 142 Shell::GetInstance()->metrics()->task_switch_metrics_recorder().OnTaskSwitch( |
| 138 source); | 143 source); |
| 139 } | 144 } |
| 140 | 145 |
| 141 void WmShellAura::ShowContextMenu(const gfx::Point& location_in_screen, | 146 void WmShellAura::ShowContextMenu(const gfx::Point& location_in_screen, |
| 142 ui::MenuSourceType source_type) { | 147 ui::MenuSourceType source_type) { |
| 143 Shell::GetInstance()->ShowContextMenu(location_in_screen, source_type); | 148 Shell::GetInstance()->ShowContextMenu(location_in_screen, source_type); |
| 144 } | 149 } |
| 145 | 150 |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 251 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 256 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
| 252 OnDisplayConfigurationChanging()); | 257 OnDisplayConfigurationChanging()); |
| 253 } | 258 } |
| 254 | 259 |
| 255 void WmShellAura::OnDisplayConfigurationChanged() { | 260 void WmShellAura::OnDisplayConfigurationChanged() { |
| 256 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 261 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
| 257 OnDisplayConfigurationChanged()); | 262 OnDisplayConfigurationChanged()); |
| 258 } | 263 } |
| 259 | 264 |
| 260 } // namespace ash | 265 } // namespace ash |
| OLD | NEW |