| 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" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" | 30 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" |
| 31 #include "ash/wm/mru_window_tracker.h" | 31 #include "ash/wm/mru_window_tracker.h" |
| 32 #include "ash/wm/overview/window_selector_controller.h" | 32 #include "ash/wm/overview/window_selector_controller.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/display_manager.h" | 41 #include "ui/display/manager/display_manager.h" |
| 41 #include "ui/display/types/native_display_delegate.h" | 42 #include "ui/display/types/native_display_delegate.h" |
| 42 | 43 |
| 43 #if defined(USE_X11) | 44 #if defined(USE_X11) |
| 44 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h" | 45 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h" |
| 45 #include "ui/display/manager/chromeos/x11/native_display_delegate_x11.h" | 46 #include "ui/display/manager/chromeos/x11/native_display_delegate_x11.h" |
| 46 #endif | 47 #endif |
| 47 | 48 |
| 48 #if defined(USE_OZONE) | 49 #if defined(USE_OZONE) |
| 49 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.
h" | 50 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.
h" |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 display::DisplayManager::UNIFIED; | 112 display::DisplayManager::UNIFIED; |
| 112 } | 113 } |
| 113 | 114 |
| 114 void ShellPortClassic::SetDisplayWorkAreaInsets(WmWindow* window, | 115 void ShellPortClassic::SetDisplayWorkAreaInsets(WmWindow* window, |
| 115 const gfx::Insets& insets) { | 116 const gfx::Insets& insets) { |
| 116 Shell::Get() | 117 Shell::Get() |
| 117 ->window_tree_host_manager() | 118 ->window_tree_host_manager() |
| 118 ->UpdateWorkAreaOfDisplayNearestWindow(window->aura_window(), insets); | 119 ->UpdateWorkAreaOfDisplayNearestWindow(window->aura_window(), insets); |
| 119 } | 120 } |
| 120 | 121 |
| 122 std::unique_ptr<display::TouchTransformSetter> |
| 123 ShellPortClassic::CreateTouchTransformDelegate() { |
| 124 std::unique_ptr<display::DefaultTouchTransformSetter> delegate = |
| 125 base::MakeUnique<display::DefaultTouchTransformSetter>(); |
| 126 return delegate; |
| 127 } |
| 128 |
| 121 void ShellPortClassic::LockCursor() { | 129 void ShellPortClassic::LockCursor() { |
| 122 Shell::Get()->cursor_manager()->LockCursor(); | 130 Shell::Get()->cursor_manager()->LockCursor(); |
| 123 } | 131 } |
| 124 | 132 |
| 125 void ShellPortClassic::UnlockCursor() { | 133 void ShellPortClassic::UnlockCursor() { |
| 126 Shell::Get()->cursor_manager()->UnlockCursor(); | 134 Shell::Get()->cursor_manager()->UnlockCursor(); |
| 127 } | 135 } |
| 128 | 136 |
| 129 void ShellPortClassic::ShowCursor() { | 137 void ShellPortClassic::ShowCursor() { |
| 130 Shell::Get()->cursor_manager()->ShowCursor(); | 138 Shell::Get()->cursor_manager()->ShowCursor(); |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 299 for (auto& observer : display_observers_) | 307 for (auto& observer : display_observers_) |
| 300 observer.OnDisplayConfigurationChanging(); | 308 observer.OnDisplayConfigurationChanging(); |
| 301 } | 309 } |
| 302 | 310 |
| 303 void ShellPortClassic::OnDisplayConfigurationChanged() { | 311 void ShellPortClassic::OnDisplayConfigurationChanged() { |
| 304 for (auto& observer : display_observers_) | 312 for (auto& observer : display_observers_) |
| 305 observer.OnDisplayConfigurationChanged(); | 313 observer.OnDisplayConfigurationChanged(); |
| 306 } | 314 } |
| 307 | 315 |
| 308 } // namespace ash | 316 } // namespace ash |
| OLD | NEW |