| 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> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| 11 #include "ash/common/wm_shell.h" | |
| 12 #include "ash/display/window_tree_host_manager.h" | 11 #include "ash/display/window_tree_host_manager.h" |
| 12 #include "ash/wm_shell.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 PointerWatcherAdapter; | 18 class PointerWatcherAdapter; |
| 19 | 19 |
| 20 class ASH_EXPORT WmShellAura : public WmShell, | 20 class ASH_EXPORT WmShellAura : public WmShell, |
| 21 public WindowTreeHostManager::Observer { | 21 public WindowTreeHostManager::Observer { |
| 22 public: | 22 public: |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 | 96 |
| 97 bool added_display_observer_ = false; | 97 bool added_display_observer_ = false; |
| 98 base::ObserverList<WmDisplayObserver> display_observers_; | 98 base::ObserverList<WmDisplayObserver> display_observers_; |
| 99 | 99 |
| 100 DISALLOW_COPY_AND_ASSIGN(WmShellAura); | 100 DISALLOW_COPY_AND_ASSIGN(WmShellAura); |
| 101 }; | 101 }; |
| 102 | 102 |
| 103 } // namespace ash | 103 } // namespace ash |
| 104 | 104 |
| 105 #endif // ASH_AURA_WM_SHELL_AURA_H_ | 105 #endif // ASH_AURA_WM_SHELL_AURA_H_ |
| OLD | NEW |