Renames WmShell to ShellPort

ash/shell_port.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_WM_SHELL_H_
-#define ASH_WM_SHELL_H_
+#ifndef ASH_SHELL_PORT_H_
+#define ASH_SHELL_PORT_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/metrics/gesture_action_type.h"
 #include "ash/metrics/user_metrics_action.h"
 #include "ash/wm/lock_state_observer.h"
@@ skipping 35 matching lines @@
 
 enum class Config;
 enum class LoginStatus;
 enum class TaskSwitchSource;
 
 namespace wm {
 class MaximizeModeEventHandler;
 class WindowState;
 }
 
-// Similar to ash::Shell. Eventually the two will be merged.
-class ASH_EXPORT WmShell {
+// Porting layer for Shell. This class contains the part of Shell that are
+// different in classic ash and mus/mash.
+class ASH_EXPORT ShellPort {
  public:
-  virtual ~WmShell();
+  virtual ~ShellPort();
 
-  static WmShell* Get();
+  static ShellPort* Get();
   static bool HasInstance() { return instance_ != nullptr; }
 
   virtual void Shutdown();
 
   // Returns true when ash is running as a service_manager::Service.
   // TODO(sky): remove and convert to GetAshConfig().
   virtual bool IsRunningInMash() const = 0;
   virtual Config GetAshConfig() const = 0;
 
   // Convenience for GetPrimaryRootWindow()->GetRootWindowController().
@@ skipping 122 matching lines @@
 
   // Enable or disable the laser pointer.
   virtual void SetLaserPointerEnabled(bool enabled) = 0;
 
   // Enable or disable the partial magnifier.
   virtual void SetPartialMagnifierEnabled(bool enabled) = 0;
 
   virtual void CreatePointerWatcherAdapter() = 0;
 
  protected:
-  WmShell();
+  ShellPort();
 
   // Called during startup to create the primary WindowTreeHost and
   // the corresponding RootWindowController.
   virtual void CreatePrimaryHost() = 0;
   virtual void InitHosts(const ShellInitParams& init_params) = 0;
 
   // Called during startup to create the AcceleratorController.
   virtual std::unique_ptr<AcceleratorController>
   CreateAcceleratorController() = 0;
 
  private:
   friend class AcceleratorControllerTest;
   friend class Shell;
 
-  static WmShell* instance_;
+  static ShellPort* instance_;
 
   base::ObserverList<LockStateObserver> lock_state_observers_;
 
   bool simulate_modal_window_open_for_testing_ = false;
 };
 
 }  // namespace ash
 
-#endif  // ASH_WM_SHELL_H_
+#endif  // ASH_SHELL_PORT_H_