| 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_WM_AURA_WM_GLOBALS_AURA_H_ | 5 #ifndef ASH_WM_AURA_WM_GLOBALS_AURA_H_ |
| 6 #define ASH_WM_AURA_WM_GLOBALS_AURA_H_ | 6 #define ASH_WM_AURA_WM_GLOBALS_AURA_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| 11 #include "ash/common/wm/wm_globals.h" |
| 11 #include "ash/display/window_tree_host_manager.h" | 12 #include "ash/display/window_tree_host_manager.h" |
| 12 #include "ash/shell_observer.h" | 13 #include "ash/shell_observer.h" |
| 13 #include "ash/wm/aura/wm_lookup_aura.h" | 14 #include "ash/wm/aura/wm_lookup_aura.h" |
| 14 #include "ash/wm/common/wm_globals.h" | |
| 15 #include "base/macros.h" | 15 #include "base/macros.h" |
| 16 #include "base/observer_list.h" | 16 #include "base/observer_list.h" |
| 17 #include "ui/wm/public/activation_change_observer.h" | 17 #include "ui/wm/public/activation_change_observer.h" |
| 18 | 18 |
| 19 namespace ash { | 19 namespace ash { |
| 20 namespace wm { | 20 namespace wm { |
| 21 | 21 |
| 22 class ASH_EXPORT WmGlobalsAura : public WmGlobals, | 22 class ASH_EXPORT WmGlobalsAura : public WmGlobals, |
| 23 public aura::client::ActivationChangeObserver, | 23 public aura::client::ActivationChangeObserver, |
| 24 public WindowTreeHostManager::Observer, | 24 public WindowTreeHostManager::Observer, |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 | 81 |
| 82 base::ObserverList<WmOverviewModeObserver> overview_mode_observers_; | 82 base::ObserverList<WmOverviewModeObserver> overview_mode_observers_; |
| 83 | 83 |
| 84 DISALLOW_COPY_AND_ASSIGN(WmGlobalsAura); | 84 DISALLOW_COPY_AND_ASSIGN(WmGlobalsAura); |
| 85 }; | 85 }; |
| 86 | 86 |
| 87 } // namespace wm | 87 } // namespace wm |
| 88 } // namespace ash | 88 } // namespace ash |
| 89 | 89 |
| 90 #endif // ASH_WM_AURA_WM_GLOBALS_AURA_H_ | 90 #endif // ASH_WM_AURA_WM_GLOBALS_AURA_H_ |
| OLD | NEW |