| 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_WM_SHELL_AURA_H_ |
| 6 #define ASH_AURA_WM_SHELL_AURA_H_ | 6 #define ASH_AURA_WM_SHELL_AURA_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 9 |
| 8 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| 9 #include "ash/aura/wm_lookup_aura.h" | 11 #include "ash/aura/wm_lookup_aura.h" |
| 10 #include "ash/common/wm_shell.h" | 12 #include "ash/common/wm_shell.h" |
| 11 #include "ash/display/window_tree_host_manager.h" | 13 #include "ash/display/window_tree_host_manager.h" |
| 12 #include "base/macros.h" | 14 #include "base/macros.h" |
| 13 #include "base/observer_list.h" | 15 #include "base/observer_list.h" |
| 14 #include "ui/wm/public/activation_change_observer.h" | 16 #include "ui/wm/public/activation_change_observer.h" |
| 15 | 17 |
| 16 namespace ash { | 18 namespace ash { |
| 17 | 19 |
| 18 class ASH_EXPORT WmShellAura : public WmShell, | 20 class ASH_EXPORT WmShellAura : public WmShell, |
| 19 public aura::client::ActivationChangeObserver, | 21 public aura::client::ActivationChangeObserver, |
| 20 public WindowTreeHostManager::Observer { | 22 public WindowTreeHostManager::Observer { |
| 21 public: | 23 public: |
| 22 explicit WmShellAura(ShellDelegate* delegate); | 24 explicit WmShellAura(std::unique_ptr<ShellDelegate> shell_delegate); |
| 23 ~WmShellAura() override; | 25 ~WmShellAura() override; |
| 24 | 26 |
| 25 static WmShellAura* Get(); | 27 static WmShellAura* Get(); |
| 26 | 28 |
| 27 // Called early in shutdown sequence. | 29 // Called early in shutdown sequence. |
| 28 void PrepareForShutdown(); | 30 void PrepareForShutdown(); |
| 29 | 31 |
| 30 // WmShell: | 32 // WmShell: |
| 31 WmWindow* NewContainerWindow() override; | 33 WmWindow* NewContainerWindow() override; |
| 32 WmWindow* GetFocusedWindow() override; | 34 WmWindow* GetFocusedWindow() override; |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 | 85 |
| 84 bool added_display_observer_ = false; | 86 bool added_display_observer_ = false; |
| 85 base::ObserverList<WmDisplayObserver> display_observers_; | 87 base::ObserverList<WmDisplayObserver> display_observers_; |
| 86 | 88 |
| 87 DISALLOW_COPY_AND_ASSIGN(WmShellAura); | 89 DISALLOW_COPY_AND_ASSIGN(WmShellAura); |
| 88 }; | 90 }; |
| 89 | 91 |
| 90 } // namespace ash | 92 } // namespace ash |
| 91 | 93 |
| 92 #endif // ASH_AURA_WM_SHELL_AURA_H_ | 94 #endif // ASH_AURA_WM_SHELL_AURA_H_ |
| OLD | NEW |