Gets chrome --mus some what working

ash/mus/bridge/wm_shell_mus.h

 // 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.
 
 #ifndef ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "ash/common/wm_shell.h"
 #include "base/macros.h"
 
 namespace aura {
 class WindowTreeClient;
 }
 
 namespace views {
 class PointerWatcherEventRouter;
 }
 
 namespace ash {
 
+class AcceleratorControllerDelegateAura;
 class RootWindowController;
 
 namespace mus {
 
 class AcceleratorControllerDelegateMus;
 class AcceleratorControllerRegistrar;
 class ImmersiveHandlerFactoryMus;
 class WindowManager;
 class WmShellMusTestApi;
 
 // WmShell implementation for mus.
 class WmShellMus : public WmShell {
  public:
   // If |create_session_state_delegate_stub| is true SessionStateDelegateStub is
   // created. If false, the SessionStateDelegate from Shell is used.
   WmShellMus(WmWindow* primary_root_window,
              WindowManager* window_manager,
              views::PointerWatcherEventRouter* pointer_watcher_event_router,
              bool create_session_state_delegate_stub);
   ~WmShellMus() override;
 
   static WmShellMus* Get();
 
   ash::RootWindowController* GetRootWindowControllerWithDisplayId(int64_t id);
 
-  AcceleratorControllerDelegateMus* accelerator_controller_delegate() {
-    return accelerator_controller_delegate_.get();
+  AcceleratorControllerDelegateAura* accelerator_controller_delegate_classic() {
+    return accelerator_controller_delegate_classic_.get();
   }
 
   aura::WindowTreeClient* window_tree_client();
 
   WindowManager* window_manager() { return window_manager_; }
 
   // WmShell:
   void Shutdown() override;
   bool IsRunningInMash() const override;
+  Config GetConfig() const override;
   WmWindow* GetFocusedWindow() override;
   WmWindow* GetActiveWindow() override;
   WmWindow* GetCaptureWindow() override;
   WmWindow* GetPrimaryRootWindow() override;
   WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
   const display::ManagedDisplayInfo& GetDisplayInfo(
       int64_t display_id) const override;
   bool IsActiveDisplayId(int64_t display_id) const override;
   display::Display GetFirstDisplay() const override;
   bool IsInUnifiedMode() const override;
@@ skipping 40 matching lines @@
   std::unique_ptr<AcceleratorController> CreateAcceleratorController() override;
 
  private:
   friend class WmShellMusTestApi;
 
   WindowManager* window_manager_;
 
   WmWindow* primary_root_window_;
   views::PointerWatcherEventRouter* pointer_watcher_event_router_;
 
+  // |accelerator_controller_delegate_classic_| is created in MUS mode,
+  // |accelerator_controller_delegate_| in MASH mode.
   std::unique_ptr<AcceleratorControllerDelegateMus>
       accelerator_controller_delegate_;
+  std::unique_ptr<AcceleratorControllerDelegateAura>
+      accelerator_controller_delegate_classic_;
   std::unique_ptr<AcceleratorControllerRegistrar>
       accelerator_controller_registrar_;
   std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_;
   std::unique_ptr<SessionStateDelegate> session_state_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(WmShellMus);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_