| 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/shell_port_classic.h" | 5 #include "ash/aura/shell_port_classic.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/accelerators/accelerator_controller.h" | 9 #include "ash/accelerators/accelerator_controller.h" |
| 10 #include "ash/accelerators/accelerator_controller_delegate_aura.h" | 10 #include "ash/accelerators/accelerator_controller_delegate_aura.h" |
| 11 #include "ash/aura/key_event_watcher_aura.h" | 11 #include "ash/aura/key_event_watcher_aura.h" |
| 12 #include "ash/aura/pointer_watcher_adapter.h" | 12 #include "ash/aura/pointer_watcher_adapter.h" |
| 13 #include "ash/display/window_tree_host_manager.h" | 13 #include "ash/display/window_tree_host_manager.h" |
| 14 #include "ash/host/ash_window_tree_host.h" | 14 #include "ash/host/ash_window_tree_host.h" |
| 15 #include "ash/host/ash_window_tree_host_init_params.h" | 15 #include "ash/host/ash_window_tree_host_init_params.h" |
| 16 #include "ash/keyboard/keyboard_ui.h" | 16 #include "ash/keyboard/keyboard_ui.h" |
| 17 #include "ash/laser/laser_pointer_controller.h" | 17 #include "ash/laser/laser_pointer_controller.h" |
| 18 #include "ash/magnifier/partial_magnification_controller.h" | 18 #include "ash/magnifier/partial_magnification_controller.h" |
| 19 #include "ash/metrics/task_switch_metrics_recorder.h" | 19 #include "ash/metrics/task_switch_metrics_recorder.h" |
| 20 #include "ash/public/cpp/config.h" | 20 #include "ash/public/cpp/config.h" |
| 21 #include "ash/session/session_state_delegate.h" | 21 #include "ash/session/session_state_delegate.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/shell_delegate.h" | 24 #include "ash/shell_delegate.h" |
| 25 #include "ash/shell_observer.h" | 25 #include "ash/shell_observer.h" |
| 26 #include "ash/touch/touch_uma.h" | 26 #include "ash/touch/touch_uma.h" |
| 27 #include "ash/virtual_keyboard_controller.h" | 27 #include "ash/virtual_keyboard_controller.h" |
| 28 #include "ash/wm/drag_window_resizer.h" | 28 #include "ash/wm/drag_window_resizer.h" |
| 29 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h" | |
| 30 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" | |
| 31 #include "ash/wm/mru_window_tracker.h" | 29 #include "ash/wm/mru_window_tracker.h" |
| 32 #include "ash/wm/overview/window_selector_controller.h" | 30 #include "ash/wm/overview/window_selector_controller.h" |
| 31 #include "ash/wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard.h" |
| 32 #include "ash/wm/tablet_mode/tablet_mode_event_handler_aura.h" |
| 33 #include "ash/wm/window_cycle_event_filter_aura.h" | 33 #include "ash/wm/window_cycle_event_filter_aura.h" |
| 34 #include "ash/wm/window_util.h" | 34 #include "ash/wm/window_util.h" |
| 35 #include "ash/wm/workspace/workspace_event_handler_aura.h" | 35 #include "ash/wm/workspace/workspace_event_handler_aura.h" |
| 36 #include "ash/wm_display_observer.h" | 36 #include "ash/wm_display_observer.h" |
| 37 #include "ash/wm_window.h" | 37 #include "ash/wm_window.h" |
| 38 #include "base/memory/ptr_util.h" | 38 #include "base/memory/ptr_util.h" |
| 39 #include "ui/aura/env.h" | 39 #include "ui/aura/env.h" |
| 40 #include "ui/display/manager/chromeos/default_touch_transform_setter.h" | 40 #include "ui/display/manager/chromeos/default_touch_transform_setter.h" |
| 41 #include "ui/display/manager/display_manager.h" | 41 #include "ui/display/manager/display_manager.h" |
| 42 #include "ui/display/types/native_display_delegate.h" | 42 #include "ui/display/types/native_display_delegate.h" |
| 43 | 43 |
| 44 #if defined(USE_X11) | 44 #if defined(USE_X11) |
| 45 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h" | 45 #include "ash/wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_x11.h" |
| 46 #include "ui/display/manager/chromeos/x11/native_display_delegate_x11.h" | 46 #include "ui/display/manager/chromeos/x11/native_display_delegate_x11.h" |
| 47 #endif | 47 #endif |
| 48 | 48 |
| 49 #if defined(USE_OZONE) | 49 #if defined(USE_OZONE) |
| 50 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.
h" | 50 #include "ash/wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h" |
| 51 #include "ui/display/types/native_display_delegate.h" | 51 #include "ui/display/types/native_display_delegate.h" |
| 52 #include "ui/ozone/public/ozone_platform.h" | 52 #include "ui/ozone/public/ozone_platform.h" |
| 53 #endif | 53 #endif |
| 54 | 54 |
| 55 namespace ash { | 55 namespace ash { |
| 56 | 56 |
| 57 ShellPortClassic::ShellPortClassic() {} | 57 ShellPortClassic::ShellPortClassic() {} |
| 58 | 58 |
| 59 ShellPortClassic::~ShellPortClassic() {} | 59 ShellPortClassic::~ShellPortClassic() {} |
| 60 | 60 |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 wm::WindowState* window_state) { | 178 wm::WindowState* window_state) { |
| 179 return base::WrapUnique( | 179 return base::WrapUnique( |
| 180 DragWindowResizer::Create(next_window_resizer.release(), window_state)); | 180 DragWindowResizer::Create(next_window_resizer.release(), window_state)); |
| 181 } | 181 } |
| 182 | 182 |
| 183 std::unique_ptr<WindowCycleEventFilter> | 183 std::unique_ptr<WindowCycleEventFilter> |
| 184 ShellPortClassic::CreateWindowCycleEventFilter() { | 184 ShellPortClassic::CreateWindowCycleEventFilter() { |
| 185 return base::MakeUnique<WindowCycleEventFilterAura>(); | 185 return base::MakeUnique<WindowCycleEventFilterAura>(); |
| 186 } | 186 } |
| 187 | 187 |
| 188 std::unique_ptr<wm::MaximizeModeEventHandler> | 188 std::unique_ptr<wm::TabletModeEventHandler> |
| 189 ShellPortClassic::CreateMaximizeModeEventHandler() { | 189 ShellPortClassic::CreateTabletModeEventHandler() { |
| 190 return base::WrapUnique(new wm::MaximizeModeEventHandlerAura); | 190 return base::WrapUnique(new wm::TabletModeEventHandlerAura); |
| 191 } | 191 } |
| 192 | 192 |
| 193 std::unique_ptr<WorkspaceEventHandler> | 193 std::unique_ptr<WorkspaceEventHandler> |
| 194 ShellPortClassic::CreateWorkspaceEventHandler(WmWindow* workspace_window) { | 194 ShellPortClassic::CreateWorkspaceEventHandler(WmWindow* workspace_window) { |
| 195 return base::MakeUnique<WorkspaceEventHandlerAura>(workspace_window); | 195 return base::MakeUnique<WorkspaceEventHandlerAura>(workspace_window); |
| 196 } | 196 } |
| 197 | 197 |
| 198 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> | 198 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> |
| 199 ShellPortClassic::CreateScopedDisableInternalMouseAndKeyboard() { | 199 ShellPortClassic::CreateScopedDisableInternalMouseAndKeyboard() { |
| 200 #if defined(USE_X11) | 200 #if defined(USE_X11) |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 305 for (auto& observer : display_observers_) | 305 for (auto& observer : display_observers_) |
| 306 observer.OnDisplayConfigurationChanging(); | 306 observer.OnDisplayConfigurationChanging(); |
| 307 } | 307 } |
| 308 | 308 |
| 309 void ShellPortClassic::OnDisplayConfigurationChanged() { | 309 void ShellPortClassic::OnDisplayConfigurationChanged() { |
| 310 for (auto& observer : display_observers_) | 310 for (auto& observer : display_observers_) |
| 311 observer.OnDisplayConfigurationChanged(); | 311 observer.OnDisplayConfigurationChanged(); |
| 312 } | 312 } |
| 313 | 313 |
| 314 } // namespace ash | 314 } // namespace ash |
| OLD | NEW |