| Index: ash/mus/bridge/shell_port_mash.cc
|
| diff --git a/ash/mus/bridge/shell_port_mash.cc b/ash/mus/bridge/shell_port_mash.cc
|
| index 1a78a0a5a967c52721d8d8517f954e5de6efa541..d740d0bf94d3eb94b333589abdc0ba7acb29bb2f 100644
|
| --- a/ash/mus/bridge/shell_port_mash.cc
|
| +++ b/ash/mus/bridge/shell_port_mash.cc
|
| @@ -10,6 +10,7 @@
|
| #include "ash/accelerators/accelerator_controller_delegate_aura.h"
|
| #include "ash/aura/key_event_watcher_aura.h"
|
| #include "ash/aura/pointer_watcher_adapter.h"
|
| +#include "ash/host/ash_window_tree_host.h"
|
| #include "ash/key_event_watcher.h"
|
| #include "ash/laser/laser_pointer_controller.h"
|
| #include "ash/magnifier/partial_magnification_controller.h"
|
| @@ -54,6 +55,7 @@
|
| #include "ui/aura/window.h"
|
| #include "ui/display/manager/managed_display_info.h"
|
| #include "ui/display/screen.h"
|
| +#include "ui/display/types/native_display_delegate.h"
|
| #include "ui/views/mus/pointer_watcher_event_router.h"
|
|
|
| namespace ash {
|
| @@ -423,6 +425,11 @@ void ShellPortMash::CreatePointerWatcherAdapter() {
|
| }
|
| }
|
|
|
| +std::unique_ptr<AshWindowTreeHost> ShellPortMash::CreateAshWindowTreeHost(
|
| + const AshWindowTreeHostInitParams& init_params) {
|
| + return nullptr;
|
| +}
|
| +
|
| void ShellPortMash::CreatePrimaryHost() {}
|
|
|
| void ShellPortMash::InitHosts(const ShellInitParams& init_params) {
|
| @@ -430,6 +437,11 @@ void ShellPortMash::InitHosts(const ShellInitParams& init_params) {
|
| base::WrapUnique(init_params.primary_window_tree_host));
|
| }
|
|
|
| +std::unique_ptr<display::NativeDisplayDelegate>
|
| +ShellPortMash::CreateNativeDisplayDelegate() {
|
| + return nullptr;
|
| +}
|
| +
|
| std::unique_ptr<AcceleratorController>
|
| ShellPortMash::CreateAcceleratorController() {
|
| if (GetAshConfig() == Config::MUS) {
|
|
|