| Index: ash/aura/shell_port_classic.h
|
| diff --git a/ash/aura/wm_shell_aura.h b/ash/aura/shell_port_classic.h
|
| similarity index 87%
|
| rename from ash/aura/wm_shell_aura.h
|
| rename to ash/aura/shell_port_classic.h
|
| index 4f7918b0fef8a460589b3b7940e48fa37929e1f9..a45ca52a623974aadaa3e697b72fe2497d10c139 100644
|
| --- a/ash/aura/wm_shell_aura.h
|
| +++ b/ash/aura/shell_port_classic.h
|
| @@ -2,14 +2,14 @@
|
| // 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"
|
|
|
| @@ -18,19 +18,21 @@ namespace ash {
|
| class AcceleratorControllerDelegateAura;
|
| class PointerWatcherAdapter;
|
|
|
| -class ASH_EXPORT WmShellAura : public WmShell,
|
| - public WindowTreeHostManager::Observer {
|
| +// Implementation of ShellPort for classic ash/aura. See ash/README.md for more
|
| +// details.
|
| +class ASH_EXPORT ShellPortClassic : public ShellPort,
|
| + 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:
|
| + // ShellPort:
|
| void Shutdown() override;
|
| bool IsRunningInMash() const override;
|
| Config GetAshConfig() const override;
|
| @@ -94,9 +96,9 @@ class ASH_EXPORT WmShellAura : public WmShell,
|
| 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_
|
|
|