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/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/host/ash_window_tree_host.h" | 13 #include "ash/host/ash_window_tree_host.h" |
14 #include "ash/key_event_watcher.h" | 14 #include "ash/key_event_watcher.h" |
15 #include "ash/laser/laser_pointer_controller.h" | 15 #include "ash/laser/laser_pointer_controller.h" |
16 #include "ash/magnifier/partial_magnification_controller.h" | 16 #include "ash/magnifier/partial_magnification_controller.h" |
17 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h" | 17 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h" |
18 #include "ash/mus/accelerators/accelerator_controller_registrar.h" | 18 #include "ash/mus/accelerators/accelerator_controller_registrar.h" |
19 #include "ash/mus/bridge/immersive_handler_factory_mus.h" | 19 #include "ash/mus/bridge/immersive_handler_factory_mus.h" |
20 #include "ash/mus/bridge/workspace_event_handler_mus.h" | 20 #include "ash/mus/bridge/workspace_event_handler_mus.h" |
21 #include "ash/mus/drag_window_resizer.h" | 21 #include "ash/mus/drag_window_resizer.h" |
22 #include "ash/mus/keyboard_ui_mus.h" | 22 #include "ash/mus/keyboard_ui_mus.h" |
23 #include "ash/mus/screen_mus.h" | 23 #include "ash/mus/screen_mus.h" |
24 #include "ash/mus/window_manager.h" | 24 #include "ash/mus/window_manager.h" |
25 #include "ash/public/cpp/config.h" | 25 #include "ash/public/cpp/config.h" |
| 26 #include "ash/public/cpp/shell_window_ids.h" |
26 #include "ash/root_window_controller.h" | 27 #include "ash/root_window_controller.h" |
27 #include "ash/root_window_settings.h" | 28 #include "ash/root_window_settings.h" |
28 #include "ash/session/session_state_delegate.h" | 29 #include "ash/session/session_state_delegate.h" |
29 #include "ash/shared/immersive_fullscreen_controller.h" | 30 #include "ash/shared/immersive_fullscreen_controller.h" |
30 #include "ash/shell.h" | 31 #include "ash/shell.h" |
31 #include "ash/shell_delegate.h" | 32 #include "ash/shell_delegate.h" |
32 #include "ash/shell_init_params.h" | 33 #include "ash/shell_init_params.h" |
33 #include "ash/shell_observer.h" | 34 #include "ash/shell_observer.h" |
34 #include "ash/system/tray/system_tray_delegate.h" | 35 #include "ash/system/tray/system_tray_delegate.h" |
35 #include "ash/touch/touch_uma.h" | 36 #include "ash/touch/touch_uma.h" |
36 #include "ash/virtual_keyboard_controller.h" | 37 #include "ash/virtual_keyboard_controller.h" |
37 #include "ash/wallpaper/wallpaper_delegate.h" | 38 #include "ash/wallpaper/wallpaper_delegate.h" |
38 #include "ash/wm/drag_window_resizer.h" | 39 #include "ash/wm/drag_window_resizer.h" |
39 #include "ash/wm/maximize_mode/maximize_mode_event_handler.h" | 40 #include "ash/wm/maximize_mode/maximize_mode_event_handler.h" |
40 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h" | 41 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h" |
41 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" | 42 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" |
42 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.
h" | 43 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.
h" |
43 #include "ash/wm/mru_window_tracker.h" | 44 #include "ash/wm/mru_window_tracker.h" |
44 #include "ash/wm/window_cycle_event_filter.h" | 45 #include "ash/wm/window_cycle_event_filter.h" |
45 #include "ash/wm/window_cycle_event_filter_aura.h" | 46 #include "ash/wm/window_cycle_event_filter_aura.h" |
46 #include "ash/wm/window_resizer.h" | 47 #include "ash/wm/window_resizer.h" |
47 #include "ash/wm/window_util.h" | 48 #include "ash/wm/window_util.h" |
48 #include "ash/wm/workspace/workspace_event_handler_aura.h" | 49 #include "ash/wm/workspace/workspace_event_handler_aura.h" |
49 #include "ash/wm_window.h" | 50 #include "ash/wm_window.h" |
50 #include "base/memory/ptr_util.h" | 51 #include "base/memory/ptr_util.h" |
51 #include "components/user_manager/user_info_impl.h" | 52 #include "components/user_manager/user_info_impl.h" |
52 #include "ui/aura/env.h" | 53 #include "ui/aura/env.h" |
| 54 #include "ui/aura/mus/focus_synchronizer.h" |
53 #include "ui/aura/mus/window_tree_client.h" | 55 #include "ui/aura/mus/window_tree_client.h" |
54 #include "ui/aura/mus/window_tree_host_mus.h" | 56 #include "ui/aura/mus/window_tree_host_mus.h" |
55 #include "ui/aura/window.h" | 57 #include "ui/aura/window.h" |
56 #include "ui/display/manager/managed_display_info.h" | 58 #include "ui/display/manager/managed_display_info.h" |
57 #include "ui/display/screen.h" | 59 #include "ui/display/screen.h" |
58 #include "ui/display/types/native_display_delegate.h" | 60 #include "ui/display/types/native_display_delegate.h" |
59 #include "ui/views/mus/pointer_watcher_event_router.h" | 61 #include "ui/views/mus/pointer_watcher_event_router.h" |
60 | 62 |
61 namespace ash { | 63 namespace ash { |
62 namespace mus { | 64 namespace mus { |
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
423 mus_state_->pointer_watcher_adapter = | 425 mus_state_->pointer_watcher_adapter = |
424 base::MakeUnique<PointerWatcherAdapter>(); | 426 base::MakeUnique<PointerWatcherAdapter>(); |
425 } | 427 } |
426 } | 428 } |
427 | 429 |
428 std::unique_ptr<AshWindowTreeHost> ShellPortMash::CreateAshWindowTreeHost( | 430 std::unique_ptr<AshWindowTreeHost> ShellPortMash::CreateAshWindowTreeHost( |
429 const AshWindowTreeHostInitParams& init_params) { | 431 const AshWindowTreeHostInitParams& init_params) { |
430 return nullptr; | 432 return nullptr; |
431 } | 433 } |
432 | 434 |
| 435 void ShellPortMash::OnCreatedRootWindowContainers( |
| 436 RootWindowController* root_window_controller) { |
| 437 // TODO: To avoid lots of IPC AddActivationParent() should take an array. |
| 438 // http://crbug.com/682048. |
| 439 aura::Window* root_window = root_window_controller->GetRootWindow(); |
| 440 for (size_t i = 0; i < kNumActivatableShellWindowIds; ++i) { |
| 441 window_manager_->window_manager_client()->AddActivationParent( |
| 442 root_window->GetChildById(kActivatableShellWindowIds[i])); |
| 443 } |
| 444 } |
| 445 |
433 void ShellPortMash::CreatePrimaryHost() {} | 446 void ShellPortMash::CreatePrimaryHost() {} |
434 | 447 |
435 void ShellPortMash::InitHosts(const ShellInitParams& init_params) { | 448 void ShellPortMash::InitHosts(const ShellInitParams& init_params) { |
436 window_manager_->CreatePrimaryRootWindowController( | 449 window_manager_->CreatePrimaryRootWindowController( |
437 base::WrapUnique(init_params.primary_window_tree_host)); | 450 base::WrapUnique(init_params.primary_window_tree_host)); |
438 } | 451 } |
439 | 452 |
440 std::unique_ptr<display::NativeDisplayDelegate> | 453 std::unique_ptr<display::NativeDisplayDelegate> |
441 ShellPortMash::CreateNativeDisplayDelegate() { | 454 ShellPortMash::CreateNativeDisplayDelegate() { |
442 return nullptr; | 455 return nullptr; |
(...skipping 23 matching lines...) Expand all Loading... |
466 mash_state_->accelerator_controller_registrar = | 479 mash_state_->accelerator_controller_registrar = |
467 base ::MakeUnique<AcceleratorControllerRegistrar>( | 480 base ::MakeUnique<AcceleratorControllerRegistrar>( |
468 window_manager_, accelerator_namespace_id); | 481 window_manager_, accelerator_namespace_id); |
469 return base::MakeUnique<AcceleratorController>( | 482 return base::MakeUnique<AcceleratorController>( |
470 mash_state_->accelerator_controller_delegate.get(), | 483 mash_state_->accelerator_controller_delegate.get(), |
471 mash_state_->accelerator_controller_registrar.get()); | 484 mash_state_->accelerator_controller_registrar.get()); |
472 } | 485 } |
473 | 486 |
474 } // namespace mus | 487 } // namespace mus |
475 } // namespace ash | 488 } // namespace ash |
OLD | NEW |