Make WmShellMus use classic types for mus

ash/mus/bridge/wm_shell_mus.h

Index: ash/mus/bridge/wm_shell_mus.h
diff --git a/ash/mus/bridge/wm_shell_mus.h b/ash/mus/bridge/wm_shell_mus.h
index eb756e7adbb990653786b67bef157f2098137033..878acfc8b34259b842baff76b8be18e6dead8ba4 100644
--- a/ash/mus/bridge/wm_shell_mus.h
+++ b/ash/mus/bridge/wm_shell_mus.h
@@ -24,6 +24,7 @@ class PointerWatcherEventRouter;
 namespace ash {
 
 class AcceleratorControllerDelegateAura;
+class PointerWatcherAdapter;
 class RootWindowController;
 
 namespace mus {
@@ -119,8 +120,13 @@ class WmShellMus : public WmShell {
   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>