| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef ASH_AURA_WM_SHELL_AURA_H_ | 5 #ifndef ASH_AURA_SHELL_PORT_CLASSIC_H_ |
| 6 #define ASH_AURA_WM_SHELL_AURA_H_ | 6 #define ASH_AURA_SHELL_PORT_CLASSIC_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| 11 #include "ash/display/window_tree_host_manager.h" | 11 #include "ash/display/window_tree_host_manager.h" |
| 12 #include "ash/wm_shell.h" | 12 #include "ash/shell_port.h" |
| 13 #include "base/macros.h" | 13 #include "base/macros.h" |
| 14 #include "base/observer_list.h" | 14 #include "base/observer_list.h" |
| 15 | 15 |
| 16 namespace ash { | 16 namespace ash { |
| 17 | 17 |
| 18 class AcceleratorControllerDelegateAura; | 18 class AcceleratorControllerDelegateAura; |
| 19 class PointerWatcherAdapter; | 19 class PointerWatcherAdapter; |
| 20 | 20 |
| 21 class ASH_EXPORT WmShellAura : public WmShell, | 21 // Implementation of ShellPort for classic ash/aura. See ash/README.md for more |
| 22 public WindowTreeHostManager::Observer { | 22 // details. |
| 23 class ASH_EXPORT ShellPortClassic : public ShellPort, |
| 24 public WindowTreeHostManager::Observer { |
| 23 public: | 25 public: |
| 24 WmShellAura(); | 26 ShellPortClassic(); |
| 25 ~WmShellAura() override; | 27 ~ShellPortClassic() override; |
| 26 | 28 |
| 27 static WmShellAura* Get(); | 29 static ShellPortClassic* Get(); |
| 28 | 30 |
| 29 AcceleratorControllerDelegateAura* accelerator_controller_delegate() { | 31 AcceleratorControllerDelegateAura* accelerator_controller_delegate() { |
| 30 return accelerator_controller_delegate_.get(); | 32 return accelerator_controller_delegate_.get(); |
| 31 } | 33 } |
| 32 | 34 |
| 33 // WmShell: | 35 // ShellPort: |
| 34 void Shutdown() override; | 36 void Shutdown() override; |
| 35 bool IsRunningInMash() const override; | 37 bool IsRunningInMash() const override; |
| 36 Config GetAshConfig() const override; | 38 Config GetAshConfig() const override; |
| 37 WmWindow* GetPrimaryRootWindow() override; | 39 WmWindow* GetPrimaryRootWindow() override; |
| 38 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override; | 40 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override; |
| 39 const display::ManagedDisplayInfo& GetDisplayInfo( | 41 const display::ManagedDisplayInfo& GetDisplayInfo( |
| 40 int64_t display_id) const override; | 42 int64_t display_id) const override; |
| 41 bool IsActiveDisplayId(int64_t display_id) const override; | 43 bool IsActiveDisplayId(int64_t display_id) const override; |
| 42 display::Display GetFirstDisplay() const override; | 44 display::Display GetFirstDisplay() const override; |
| 43 bool IsInUnifiedMode() const override; | 45 bool IsInUnifiedMode() const override; |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 void OnDisplayConfigurationChanged() override; | 89 void OnDisplayConfigurationChanged() override; |
| 88 | 90 |
| 89 std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_; | 91 std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_; |
| 90 | 92 |
| 91 bool added_display_observer_ = false; | 93 bool added_display_observer_ = false; |
| 92 base::ObserverList<WmDisplayObserver> display_observers_; | 94 base::ObserverList<WmDisplayObserver> display_observers_; |
| 93 | 95 |
| 94 std::unique_ptr<AcceleratorControllerDelegateAura> | 96 std::unique_ptr<AcceleratorControllerDelegateAura> |
| 95 accelerator_controller_delegate_; | 97 accelerator_controller_delegate_; |
| 96 | 98 |
| 97 DISALLOW_COPY_AND_ASSIGN(WmShellAura); | 99 DISALLOW_COPY_AND_ASSIGN(ShellPortClassic); |
| 98 }; | 100 }; |
| 99 | 101 |
| 100 } // namespace ash | 102 } // namespace ash |
| 101 | 103 |
| 102 #endif // ASH_AURA_WM_SHELL_AURA_H_ | 104 #endif // ASH_AURA_SHELL_PORT_CLASSIC_H_ |
| OLD | NEW |