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" |
11 #include "ash/common/session/session_state_delegate.h" | 11 #include "ash/common/session/session_state_delegate.h" |
12 #include "ash/common/shell_delegate.h" | 12 #include "ash/common/shell_delegate.h" |
13 #include "ash/common/shell_observer.h" | 13 #include "ash/common/shell_observer.h" |
14 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard
.h" | 14 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard
.h" |
15 #include "ash/common/wm/mru_window_tracker.h" | 15 #include "ash/common/wm/mru_window_tracker.h" |
16 #include "ash/common/wm/overview/window_selector_controller.h" | 16 #include "ash/common/wm/overview/window_selector_controller.h" |
17 #include "ash/common/wm_activation_observer.h" | 17 #include "ash/common/wm_activation_observer.h" |
18 #include "ash/common/wm_display_observer.h" | 18 #include "ash/common/wm_display_observer.h" |
19 #include "ash/display/display_manager.h" | 19 #include "ash/display/display_manager.h" |
20 #include "ash/display/window_tree_host_manager.h" | 20 #include "ash/display/window_tree_host_manager.h" |
21 #include "ash/metrics/task_switch_metrics_recorder.h" | 21 #include "ash/metrics/task_switch_metrics_recorder.h" |
22 #include "ash/shared/immersive_fullscreen_controller.h" | 22 #include "ash/shared/immersive_fullscreen_controller.h" |
23 #include "ash/shell.h" | 23 #include "ash/shell.h" |
24 #include "ash/touch/touch_uma.h" | 24 #include "ash/touch/touch_uma.h" |
25 #include "ash/wm/drag_window_resizer.h" | 25 #include "ash/wm/drag_window_resizer.h" |
26 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h" | 26 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h" |
27 #include "ash/wm/screen_pinning_controller.h" | 27 #include "ash/wm/screen_pinning_controller.h" |
28 #include "ash/wm/window_cycle_event_filter_aura.h" | 28 #include "ash/wm/window_cycle_event_filter_aura.h" |
29 #include "ash/wm/window_util.h" | 29 #include "ash/wm/window_util.h" |
| 30 #include "ash/wm/workspace/workspace_event_handler_aura.h" |
30 #include "base/memory/ptr_util.h" | 31 #include "base/memory/ptr_util.h" |
31 #include "ui/aura/client/capture_client.h" | 32 #include "ui/aura/client/capture_client.h" |
32 #include "ui/aura/client/focus_client.h" | 33 #include "ui/aura/client/focus_client.h" |
33 #include "ui/aura/env.h" | 34 #include "ui/aura/env.h" |
34 #include "ui/wm/public/activation_client.h" | 35 #include "ui/wm/public/activation_client.h" |
35 | 36 |
36 #if defined(OS_CHROMEOS) | 37 #if defined(OS_CHROMEOS) |
37 #include "ash/virtual_keyboard_controller.h" | 38 #include "ash/virtual_keyboard_controller.h" |
38 #endif | 39 #endif |
39 | 40 |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 std::unique_ptr<WindowCycleEventFilter> | 197 std::unique_ptr<WindowCycleEventFilter> |
197 WmShellAura::CreateWindowCycleEventFilter() { | 198 WmShellAura::CreateWindowCycleEventFilter() { |
198 return base::MakeUnique<WindowCycleEventFilterAura>(); | 199 return base::MakeUnique<WindowCycleEventFilterAura>(); |
199 } | 200 } |
200 | 201 |
201 std::unique_ptr<wm::MaximizeModeEventHandler> | 202 std::unique_ptr<wm::MaximizeModeEventHandler> |
202 WmShellAura::CreateMaximizeModeEventHandler() { | 203 WmShellAura::CreateMaximizeModeEventHandler() { |
203 return base::WrapUnique(new wm::MaximizeModeEventHandlerAura); | 204 return base::WrapUnique(new wm::MaximizeModeEventHandlerAura); |
204 } | 205 } |
205 | 206 |
| 207 std::unique_ptr<WorkspaceEventHandler> WmShellAura::CreateWorkspaceEventHandler( |
| 208 WmWindow* workspace_window) { |
| 209 return base::MakeUnique<WorkspaceEventHandlerAura>(workspace_window); |
| 210 } |
| 211 |
206 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> | 212 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> |
207 WmShellAura::CreateScopedDisableInternalMouseAndKeyboard() { | 213 WmShellAura::CreateScopedDisableInternalMouseAndKeyboard() { |
208 #if defined(USE_X11) | 214 #if defined(USE_X11) |
209 return base::WrapUnique(new ScopedDisableInternalMouseAndKeyboardX11); | 215 return base::WrapUnique(new ScopedDisableInternalMouseAndKeyboardX11); |
210 #elif defined(USE_OZONE) | 216 #elif defined(USE_OZONE) |
211 return base::WrapUnique(new ScopedDisableInternalMouseAndKeyboardOzone); | 217 return base::WrapUnique(new ScopedDisableInternalMouseAndKeyboardOzone); |
212 #endif | 218 #endif |
213 return nullptr; | 219 return nullptr; |
214 } | 220 } |
215 | 221 |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
300 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 306 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
301 OnDisplayConfigurationChanging()); | 307 OnDisplayConfigurationChanging()); |
302 } | 308 } |
303 | 309 |
304 void WmShellAura::OnDisplayConfigurationChanged() { | 310 void WmShellAura::OnDisplayConfigurationChanged() { |
305 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 311 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
306 OnDisplayConfigurationChanged()); | 312 OnDisplayConfigurationChanged()); |
307 } | 313 } |
308 | 314 |
309 } // namespace ash | 315 } // namespace ash |
OLD | NEW |