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