Renames WmShell to ShellPort

ash/aura/shell_port_classic.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_AURA_WM_SHELL_AURA_H_
-#define ASH_AURA_WM_SHELL_AURA_H_
+#ifndef ASH_AURA_SHELL_PORT_CLASSIC_H_
+#define ASH_AURA_SHELL_PORT_CLASSIC_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/display/window_tree_host_manager.h"
-#include "ash/wm_shell.h"
+#include "ash/shell_port.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 
 namespace ash {
 
 class AcceleratorControllerDelegateAura;
 class PointerWatcherAdapter;
 
-class ASH_EXPORT WmShellAura : public WmShell,
-                               public WindowTreeHostManager::Observer {
+class ASH_EXPORT ShellPortClassic : public ShellPort,

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

While you're here can you add a brief class comment? Maybe point to the README
for classic vs. mash?

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

Done.

+                                    public WindowTreeHostManager::Observer {
  public:
-  WmShellAura();
-  ~WmShellAura() override;
+  ShellPortClassic();
+  ~ShellPortClassic() override;
 
-  static WmShellAura* Get();
+  static ShellPortClassic* Get();
 
   AcceleratorControllerDelegateAura* accelerator_controller_delegate() {
     return accelerator_controller_delegate_.get();
   }
 
   // WmShell:

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

nit: ShellPort:

(I wonder if a grep for WmShell would turn up other references.)

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

Done.

   void Shutdown() override;
   bool IsRunningInMash() const override;
   Config GetAshConfig() const override;
   WmWindow* GetPrimaryRootWindow() override;
   WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
   const display::ManagedDisplayInfo& GetDisplayInfo(
       int64_t display_id) const override;
   bool IsActiveDisplayId(int64_t display_id) const override;
   display::Display GetFirstDisplay() const override;
   bool IsInUnifiedMode() const override;
@@ skipping 43 matching lines @@
   void OnDisplayConfigurationChanged() override;
 
   std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_;
 
   bool added_display_observer_ = false;
   base::ObserverList<WmDisplayObserver> display_observers_;
 
   std::unique_ptr<AcceleratorControllerDelegateAura>
       accelerator_controller_delegate_;
 
-  DISALLOW_COPY_AND_ASSIGN(WmShellAura);
+  DISALLOW_COPY_AND_ASSIGN(ShellPortClassic);
 };
 
 }  // namespace ash
 
-#endif  // ASH_AURA_WM_SHELL_AURA_H_
+#endif  // ASH_AURA_SHELL_PORT_CLASSIC_H_