| 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" |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 | 134 |
| 135 void WmShellAura::RecordUserMetricsAction(UserMetricsAction action) { | 135 void WmShellAura::RecordUserMetricsAction(UserMetricsAction action) { |
| 136 Shell::GetInstance()->metrics()->RecordUserMetricsAction(action); | 136 Shell::GetInstance()->metrics()->RecordUserMetricsAction(action); |
| 137 } | 137 } |
| 138 | 138 |
| 139 void WmShellAura::RecordTaskSwitchMetric(TaskSwitchSource source) { | 139 void WmShellAura::RecordTaskSwitchMetric(TaskSwitchSource source) { |
| 140 Shell::GetInstance()->metrics()->task_switch_metrics_recorder().OnTaskSwitch( | 140 Shell::GetInstance()->metrics()->task_switch_metrics_recorder().OnTaskSwitch( |
| 141 source); | 141 source); |
| 142 } | 142 } |
| 143 | 143 |
| 144 void WmShellAura::ShowContextMenu(const gfx::Point& location_in_screen, |
| 145 ui::MenuSourceType source_type) { |
| 146 Shell::GetInstance()->ShowContextMenu(location_in_screen, source_type); |
| 147 } |
| 148 |
| 144 std::unique_ptr<WindowResizer> WmShellAura::CreateDragWindowResizer( | 149 std::unique_ptr<WindowResizer> WmShellAura::CreateDragWindowResizer( |
| 145 std::unique_ptr<WindowResizer> next_window_resizer, | 150 std::unique_ptr<WindowResizer> next_window_resizer, |
| 146 wm::WindowState* window_state) { | 151 wm::WindowState* window_state) { |
| 147 return base::WrapUnique( | 152 return base::WrapUnique( |
| 148 DragWindowResizer::Create(next_window_resizer.release(), window_state)); | 153 DragWindowResizer::Create(next_window_resizer.release(), window_state)); |
| 149 } | 154 } |
| 150 | 155 |
| 151 std::unique_ptr<WindowCycleEventFilter> | 156 std::unique_ptr<WindowCycleEventFilter> |
| 152 WmShellAura::CreateWindowCycleEventFilter() { | 157 WmShellAura::CreateWindowCycleEventFilter() { |
| 153 return base::MakeUnique<WindowCycleEventFilterAura>(); | 158 return base::MakeUnique<WindowCycleEventFilterAura>(); |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 247 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
| 243 OnDisplayConfigurationChanging()); | 248 OnDisplayConfigurationChanging()); |
| 244 } | 249 } |
| 245 | 250 |
| 246 void WmShellAura::OnDisplayConfigurationChanged() { | 251 void WmShellAura::OnDisplayConfigurationChanged() { |
| 247 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 252 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
| 248 OnDisplayConfigurationChanged()); | 253 OnDisplayConfigurationChanged()); |
| 249 } | 254 } |
| 250 | 255 |
| 251 } // namespace ash | 256 } // namespace ash |
| OLD | NEW |