Renames WmShell to ShellPort

ash/mus/bridge/shell_port_mash.h

Index: ash/mus/bridge/shell_port_mash.h
diff --git a/ash/mus/bridge/wm_shell_mus.h b/ash/mus/bridge/shell_port_mash.h
similarity index 88%
rename from ash/mus/bridge/wm_shell_mus.h
rename to ash/mus/bridge/shell_port_mash.h
index 14e3c534f490b093b7b2eb64dcb4b52c0f726f62..60e23aa6cfc08247a893f9576c6757ea850e9d2c 100644
--- a/ash/mus/bridge/wm_shell_mus.h
+++ b/ash/mus/bridge/shell_port_mash.h
@@ -2,15 +2,15 @@
 // 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_
+#ifndef ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_

[James Cook, 2017/04/10 22:00:41]

Not necessarily for this CL: Should ash/mus/bridge/* move into /ash/mus?

[sky, 2017/04/10 22:16:25]

Agreed

+#define ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
-#include "ash/wm_shell.h"
+#include "ash/shell_port.h"
 #include "base/macros.h"
 
 namespace aura {
@@ -33,20 +33,20 @@ class AcceleratorControllerDelegateMus;
 class AcceleratorControllerRegistrar;
 class ImmersiveHandlerFactoryMus;
 class WindowManager;
-class WmShellMusTestApi;
+class ShellPortMashTestApi;
 
 // WmShell implementation for mus.

[James Cook, 2017/04/10 22:00:41]

nit: ShellPort.

optional: Maybe refer to README also?

[sky, 2017/04/10 22:16:25]

Done.

-class WmShellMus : public WmShell {
+class ShellPortMash : public ShellPort {
  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;
+  ShellPortMash(WmWindow* primary_root_window,
+                WindowManager* window_manager,
+                views::PointerWatcherEventRouter* pointer_watcher_event_router,
+                bool create_session_state_delegate_stub);
+  ~ShellPortMash() override;
 
-  static WmShellMus* Get();
+  static ShellPortMash* Get();
 
   ash::RootWindowController* GetRootWindowControllerWithDisplayId(int64_t id);
 
@@ -110,7 +110,7 @@ class WmShellMus : public WmShell {
   std::unique_ptr<AcceleratorController> CreateAcceleratorController() override;
 
  private:
-  friend class WmShellMusTestApi;
+  friend class ShellPortMashTestApi;
 
   struct MashSpecificState {
     MashSpecificState();
@@ -144,10 +144,10 @@ class WmShellMus : public WmShell {
 
   std::unique_ptr<SessionStateDelegate> session_state_delegate_;
 
-  DISALLOW_COPY_AND_ASSIGN(WmShellMus);
+  DISALLOW_COPY_AND_ASSIGN(ShellPortMash);
 };
 
 }  // namespace mus
 }  // namespace ash
 
-#endif  // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
+#endif  // ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_