Make WmShellMus use classic types for mus

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 PointerWatcherAdapter;
 class RootWindowController;
 
 namespace mus {
 
 class AcceleratorControllerDelegateMus;
 class AcceleratorControllerRegistrar;
 class ImmersiveHandlerFactoryMus;
 class WindowManager;
 class WmShellMusTestApi;
 
@@ skipping 75 matching lines @@
   void CreatePrimaryHost() override;
   void InitHosts(const ShellInitParams& init_params) override;
   std::unique_ptr<AcceleratorController> CreateAcceleratorController() override;
 
  private:
   friend class WmShellMusTestApi;
 
   WindowManager* window_manager_;
 
   WmWindow* primary_root_window_;
+
+  // Used in Config::MASH.

[msw, 2017/03/28 20:26:32]

optional nit: make MUS/MASH comment styling match between this and
accelerator_controller_delegate_* below?

[sky, 2017/03/28 21:21:01]

I restructured this code to make it more obvious what is used where.

   views::PointerWatcherEventRouter* pointer_watcher_event_router_;

[msw, 2017/03/28 20:26:32]

optional nit: maybe add more meaningful comments about the meaning and usage of
these pointer watcher instances? (ok if not, other members don't)

 
+  // Used in Config::MUS.
+  std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_;
+
   // |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_