Gets chrome --mus some what working

ash/mus/bridge/wm_shell_mus.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/mus/bridge/wm_shell_mus.h"
 
 #include <utility>
 
+#include "ash/accelerators/accelerator_controller_delegate_aura.h"
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/key_event_watcher.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wallpaper/wallpaper_delegate.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"
 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/window_cycle_event_filter.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm_window.h"
 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h"
 #include "ash/mus/accelerators/accelerator_controller_registrar.h"
 #include "ash/mus/bridge/immersive_handler_factory_mus.h"
 #include "ash/mus/bridge/workspace_event_handler_mus.h"
 #include "ash/mus/drag_window_resizer.h"
 #include "ash/mus/keyboard_ui_mus.h"
 #include "ash/mus/screen_mus.h"
 #include "ash/mus/window_manager.h"
+#include "ash/public/cpp/config.h"
 #include "ash/root_window_controller.h"
 #include "ash/root_window_settings.h"
 #include "ash/shared/immersive_fullscreen_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_init_params.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
 #include "components/user_manager/user_info_impl.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
@@ skipping 42 matching lines @@
     WindowManager* window_manager,
     views::PointerWatcherEventRouter* pointer_watcher_event_router,
     bool create_session_state_delegate_stub)
     : window_manager_(window_manager),
       primary_root_window_(primary_root_window),
       pointer_watcher_event_router_(pointer_watcher_event_router) {
   if (create_session_state_delegate_stub)
     session_state_delegate_ = base::MakeUnique<SessionStateDelegateStub>();
   DCHECK(primary_root_window_);
 
-  immersive_handler_factory_.reset(new ImmersiveHandlerFactoryMus);
+  if (GetConfig() == Config::MASH)
+    immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryMus>();
 }
 
 WmShellMus::~WmShellMus() {
 }
 
 // static
 WmShellMus* WmShellMus::Get() {
+  const ash::Config config = WmShell::Get()->GetConfig();
+  CHECK(config == Config::MUS || config == Config::MASH);
   return static_cast<WmShellMus*>(WmShell::Get());
 }
 
 RootWindowController* WmShellMus::GetRootWindowControllerWithDisplayId(
     int64_t id) {
   for (RootWindowController* root_window_controller :
        RootWindowController::root_window_controllers()) {
     RootWindowSettings* settings =
         GetRootWindowSettings(root_window_controller->GetRootWindow());
     DCHECK(settings);
     if (settings->display_id == id)
       return root_window_controller;
   }
   return nullptr;
 }
 
 aura::WindowTreeClient* WmShellMus::window_tree_client() {
   return window_manager_->window_tree_client();
 }
 
 void WmShellMus::Shutdown() {
   WmShell::Shutdown();
 
   window_manager_->DeleteAllRootWindowControllers();
 }
 
 bool WmShellMus::IsRunningInMash() const {
-  return true;
+  return GetConfig() == Config::MASH;
+}
+
+Config WmShellMus::GetConfig() const {
+  return window_manager_->config();
 }
 
 WmWindow* WmShellMus::GetFocusedWindow() {
   // TODO: remove as both WmShells use same implementation.
   return WmWindow::Get(
       aura::client::GetFocusClient(Shell::GetPrimaryRootWindow())
           ->GetFocusedWindow());
 }
 
 WmWindow* WmShellMus::GetActiveWindow() {
@@ skipping 208 matching lines @@
 void WmShellMus::CreatePrimaryHost() {}
 
 void WmShellMus::InitHosts(const ShellInitParams& init_params) {
   window_manager_->CreatePrimaryRootWindowController(
       base::WrapUnique(init_params.primary_window_tree_host));
 }
 
 std::unique_ptr<AcceleratorController>
 WmShellMus::CreateAcceleratorController() {
   DCHECK(!accelerator_controller_delegate_);
+  if (GetConfig() == Config::MUS) {
+    accelerator_controller_delegate_classic_ =
+        base::MakeUnique<AcceleratorControllerDelegateAura>();
+    return base::MakeUnique<AcceleratorController>(
+        accelerator_controller_delegate_classic_.get(), nullptr);
+  }
+
   uint16_t accelerator_namespace_id = 0u;
   const bool add_result =
       window_manager_->GetNextAcceleratorNamespaceId(&accelerator_namespace_id);
   // WmShellMus is created early on, so that GetNextAcceleratorNamespaceId()
   // should always succeed.
   DCHECK(add_result);
 
   accelerator_controller_delegate_ =
       base::MakeUnique<AcceleratorControllerDelegateMus>(window_manager_);
   accelerator_controller_registrar_ =
       base ::MakeUnique<AcceleratorControllerRegistrar>(
           window_manager_, accelerator_namespace_id);
   return base::MakeUnique<AcceleratorController>(
       accelerator_controller_delegate_.get(),
       accelerator_controller_registrar_.get());
 }
 
 }  // namespace mus
 }  // namespace ash