Renames WmShell to ShellPort

ash/mus/bridge/shell_port_mash.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_
+#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 {
 class WindowTreeClient;
 }
 
 namespace views {
 class PointerWatcherEventRouter;
 }
 
 namespace ash {
 
 class AcceleratorControllerDelegateAura;
 class PointerWatcherAdapter;
 class RootWindowController;
 
 namespace mus {

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

Not for this CL, do you intend to maintain a separate ash::mus namespace? I
don't think it's a useful distinction anymore.

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

Agreed. In fact I'm also inclined to remove the ash/mus build file. WDYT?

[James Cook, 2017/04/10 23:12:03]

I'm OK with removing ash/mus/BUILD.gn.

 
 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);
 
   AcceleratorControllerDelegateAura* accelerator_controller_delegate_mus() {
     return mus_state_->accelerator_controller_delegate.get();
   }
 
   aura::WindowTreeClient* window_tree_client();
 
   WindowManager* window_manager() { return window_manager_; }
@@ skipping 43 matching lines @@
   bool IsTouchDown() override;
   void ToggleIgnoreExternalKeyboard() override;
   void SetLaserPointerEnabled(bool enabled) override;
   void SetPartialMagnifierEnabled(bool enabled) override;
   void CreatePointerWatcherAdapter() override;
   void CreatePrimaryHost() override;
   void InitHosts(const ShellInitParams& init_params) override;
   std::unique_ptr<AcceleratorController> CreateAcceleratorController() override;
 
  private:
-  friend class WmShellMusTestApi;
+  friend class ShellPortMashTestApi;
 
   struct MashSpecificState {
     MashSpecificState();
     ~MashSpecificState();
 
     views::PointerWatcherEventRouter* pointer_watcher_event_router = nullptr;
     std::unique_ptr<AcceleratorControllerDelegateMus>
         accelerator_controller_delegate;
     std::unique_ptr<AcceleratorControllerRegistrar>
         accelerator_controller_registrar;
@@ skipping 13 matching lines @@
 
   WmWindow* primary_root_window_;
 
   // Only one of |mash_state_| or |mus_state_| is created, depending upon
   // Config.
   std::unique_ptr<MashSpecificState> mash_state_;
   std::unique_ptr<MusSpecificState> mus_state_;
 
   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_