Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(414)

Side by Side Diff: ash/mus/bridge/shell_port_mash.cc

Issue 2901563002: chromeos: adds TouchDeviceServer and wires up in mushrome (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/mus/bridge/shell_port_mash.h" 5 #include "ash/mus/bridge/shell_port_mash.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_init_params.h" 14 #include "ash/host/ash_window_tree_host_init_params.h"
15 #include "ash/key_event_watcher.h" 15 #include "ash/key_event_watcher.h"
16 #include "ash/laser/laser_pointer_controller.h" 16 #include "ash/laser/laser_pointer_controller.h"
17 #include "ash/magnifier/partial_magnification_controller.h" 17 #include "ash/magnifier/partial_magnification_controller.h"
18 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h" 18 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h"
19 #include "ash/mus/accelerators/accelerator_controller_registrar.h" 19 #include "ash/mus/accelerators/accelerator_controller_registrar.h"
20 #include "ash/mus/ash_window_tree_host_mus.h" 20 #include "ash/mus/ash_window_tree_host_mus.h"
21 #include "ash/mus/bridge/immersive_handler_factory_mus.h" 21 #include "ash/mus/bridge/immersive_handler_factory_mus.h"
22 #include "ash/mus/bridge/workspace_event_handler_mus.h" 22 #include "ash/mus/bridge/workspace_event_handler_mus.h"
23 #include "ash/mus/drag_window_resizer.h" 23 #include "ash/mus/drag_window_resizer.h"
24 #include "ash/mus/keyboard_ui_mus.h" 24 #include "ash/mus/keyboard_ui_mus.h"
25 #include "ash/mus/screen_mus.h" 25 #include "ash/mus/screen_mus.h"
26 #include "ash/mus/touch_transform_setter_mus.h"
26 #include "ash/mus/window_manager.h" 27 #include "ash/mus/window_manager.h"
27 #include "ash/public/cpp/config.h" 28 #include "ash/public/cpp/config.h"
28 #include "ash/public/cpp/shell_window_ids.h" 29 #include "ash/public/cpp/shell_window_ids.h"
29 #include "ash/root_window_controller.h" 30 #include "ash/root_window_controller.h"
30 #include "ash/root_window_settings.h" 31 #include "ash/root_window_settings.h"
31 #include "ash/session/session_state_delegate.h" 32 #include "ash/session/session_state_delegate.h"
32 #include "ash/shared/immersive_fullscreen_controller.h" 33 #include "ash/shared/immersive_fullscreen_controller.h"
33 #include "ash/shell.h" 34 #include "ash/shell.h"
34 #include "ash/shell_delegate.h" 35 #include "ash/shell_delegate.h"
35 #include "ash/shell_init_params.h" 36 #include "ash/shell_init_params.h"
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 const gfx::Insets& insets) { 262 const gfx::Insets& insets) {
262 if (GetAshConfig() == Config::MUS) { 263 if (GetAshConfig() == Config::MUS) {
263 Shell::Get() 264 Shell::Get()
264 ->window_tree_host_manager() 265 ->window_tree_host_manager()
265 ->UpdateWorkAreaOfDisplayNearestWindow(window->aura_window(), insets); 266 ->UpdateWorkAreaOfDisplayNearestWindow(window->aura_window(), insets);
266 return; 267 return;
267 } 268 }
268 window_manager_->screen()->SetWorkAreaInsets(window->aura_window(), insets); 269 window_manager_->screen()->SetWorkAreaInsets(window->aura_window(), insets);
269 } 270 }
270 271
272 std::unique_ptr<display::TouchTransformSetter>
273 ShellPortMash::CreateTouchTransformDelegate() {
274 std::unique_ptr<TouchTransformSetterMus> delegate =
275 base::MakeUnique<TouchTransformSetterMus>(window_manager_->connector());
276 return delegate;
277 }
278
271 void ShellPortMash::LockCursor() { 279 void ShellPortMash::LockCursor() {
272 window_manager_->window_manager_client()->LockCursor(); 280 window_manager_->window_manager_client()->LockCursor();
273 } 281 }
274 282
275 void ShellPortMash::UnlockCursor() { 283 void ShellPortMash::UnlockCursor() {
276 window_manager_->window_manager_client()->UnlockCursor(); 284 window_manager_->window_manager_client()->UnlockCursor();
277 } 285 }
278 286
279 void ShellPortMash::ShowCursor() { 287 void ShellPortMash::ShowCursor() {
280 window_manager_->window_manager_client()->SetCursorVisible(true); 288 window_manager_->window_manager_client()->SetCursorVisible(true);
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
628 observer.OnDisplayConfigurationChanging(); 636 observer.OnDisplayConfigurationChanging();
629 } 637 }
630 638
631 void ShellPortMash::OnDisplayConfigurationChanged() { 639 void ShellPortMash::OnDisplayConfigurationChanged() {
632 for (auto& observer : display_observers_) 640 for (auto& observer : display_observers_)
633 observer.OnDisplayConfigurationChanged(); 641 observer.OnDisplayConfigurationChanged();
634 } 642 }
635 643
636 } // namespace mus 644 } // namespace mus
637 } // namespace ash 645 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698