| 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/pointer_watcher_adapter.h" | 9 #include "ash/aura/pointer_watcher_adapter.h" |
| 10 #include "ash/aura/wm_window_aura.h" | 10 #include "ash/aura/wm_window_aura.h" |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 | 178 |
| 179 void WmShellAura::RecordGestureAction(GestureActionType action) { | 179 void WmShellAura::RecordGestureAction(GestureActionType action) { |
| 180 TouchUMA::GetInstance()->RecordGestureAction(action); | 180 TouchUMA::GetInstance()->RecordGestureAction(action); |
| 181 } | 181 } |
| 182 | 182 |
| 183 void WmShellAura::RecordTaskSwitchMetric(TaskSwitchSource source) { | 183 void WmShellAura::RecordTaskSwitchMetric(TaskSwitchSource source) { |
| 184 Shell::GetInstance()->metrics()->task_switch_metrics_recorder().OnTaskSwitch( | 184 Shell::GetInstance()->metrics()->task_switch_metrics_recorder().OnTaskSwitch( |
| 185 source); | 185 source); |
| 186 } | 186 } |
| 187 | 187 |
| 188 void WmShellAura::ShowContextMenu(const gfx::Point& location_in_screen, | |
| 189 ui::MenuSourceType source_type) { | |
| 190 Shell::GetInstance()->ShowContextMenu(location_in_screen, source_type); | |
| 191 } | |
| 192 | |
| 193 std::unique_ptr<WindowResizer> WmShellAura::CreateDragWindowResizer( | 188 std::unique_ptr<WindowResizer> WmShellAura::CreateDragWindowResizer( |
| 194 std::unique_ptr<WindowResizer> next_window_resizer, | 189 std::unique_ptr<WindowResizer> next_window_resizer, |
| 195 wm::WindowState* window_state) { | 190 wm::WindowState* window_state) { |
| 196 return base::WrapUnique( | 191 return base::WrapUnique( |
| 197 DragWindowResizer::Create(next_window_resizer.release(), window_state)); | 192 DragWindowResizer::Create(next_window_resizer.release(), window_state)); |
| 198 } | 193 } |
| 199 | 194 |
| 200 std::unique_ptr<WindowCycleEventFilter> | 195 std::unique_ptr<WindowCycleEventFilter> |
| 201 WmShellAura::CreateWindowCycleEventFilter() { | 196 WmShellAura::CreateWindowCycleEventFilter() { |
| 202 return base::MakeUnique<WindowCycleEventFilterAura>(); | 197 return base::MakeUnique<WindowCycleEventFilterAura>(); |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 309 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 304 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
| 310 OnDisplayConfigurationChanging()); | 305 OnDisplayConfigurationChanging()); |
| 311 } | 306 } |
| 312 | 307 |
| 313 void WmShellAura::OnDisplayConfigurationChanged() { | 308 void WmShellAura::OnDisplayConfigurationChanged() { |
| 314 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 309 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
| 315 OnDisplayConfigurationChanged()); | 310 OnDisplayConfigurationChanged()); |
| 316 } | 311 } |
| 317 | 312 |
| 318 } // namespace ash | 313 } // namespace ash |
| OLD | NEW |