| 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_WINDOW_AURA_H_ | 5 #ifndef ASH_WM_AURA_WM_WINDOW_AURA_H_ |
| 6 #define ASH_WM_AURA_WM_WINDOW_AURA_H_ | 6 #define ASH_WM_AURA_WM_WINDOW_AURA_H_ |
| 7 | 7 |
| 8 #include "ash/wm/common/wm_window.h" | 8 #include "ash/wm/common/wm_window.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/observer_list.h" | 10 #include "base/observer_list.h" |
| 11 #include "ui/aura/window_observer.h" | 11 #include "ui/aura/window_observer.h" |
| 12 | 12 |
| 13 namespace ash { | 13 namespace ash { |
| 14 namespace wm { | 14 namespace wm { |
| 15 | 15 |
| 16 // WmWindowAura is tied to the life of the underlying aura::Window. | 16 // WmWindowAura is tied to the life of the underlying aura::Window. |
| 17 class ASH_EXPORT WmWindowAura : public WmWindow, public aura::WindowObserver { | 17 class ASH_EXPORT WmWindowAura : public WmWindow, public aura::WindowObserver { |
| 18 public: | 18 public: |
| 19 explicit WmWindowAura(aura::Window* window); | 19 explicit WmWindowAura(aura::Window* window); |
| 20 // NOTE: this class is owned by the corresponding window. You shouldn't delete | 20 // NOTE: this class is owned by the corresponding window. You shouldn't delete |
| 21 // TODO(sky): friend deleter and make private. | 21 // TODO(sky): friend deleter and make private. |
| 22 ~WmWindowAura() override; | 22 ~WmWindowAura() override; |
| 23 | 23 |
| 24 // Returns a WmWindow for an aura::Window, creating if necessary. |window| may | 24 // Returns a WmWindow for an aura::Window, creating if necessary. |window| may |
| 25 // be null, in which case null is returned. | 25 // be null, in which case null is returned. |
| 26 static WmWindow* Get(aura::Window* window); | 26 static WmWindow* Get(aura::Window* window); |
| 27 | 27 |
| 28 static std::vector<WmWindow*> FromAuraWindows( |
| 29 const std::vector<aura::Window*>& aura_windows); |
| 30 |
| 28 static aura::Window* GetAuraWindow(WmWindow* wm_window) { | 31 static aura::Window* GetAuraWindow(WmWindow* wm_window) { |
| 29 return const_cast<aura::Window*>( | 32 return const_cast<aura::Window*>( |
| 30 GetAuraWindow(const_cast<const WmWindow*>(wm_window))); | 33 GetAuraWindow(const_cast<const WmWindow*>(wm_window))); |
| 31 } | 34 } |
| 32 static const aura::Window* GetAuraWindow(const WmWindow* wm_window); | 35 static const aura::Window* GetAuraWindow(const WmWindow* wm_window); |
| 33 | 36 |
| 34 aura::Window* aura_window() { return window_; } | 37 aura::Window* aura_window() { return window_; } |
| 35 const aura::Window* aura_window() const { return window_; } | 38 const aura::Window* aura_window() const { return window_; } |
| 36 | 39 |
| 37 // WmWindow: | 40 // WmWindow: |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 | 138 |
| 136 base::ObserverList<WmWindowObserver> observers_; | 139 base::ObserverList<WmWindowObserver> observers_; |
| 137 | 140 |
| 138 DISALLOW_COPY_AND_ASSIGN(WmWindowAura); | 141 DISALLOW_COPY_AND_ASSIGN(WmWindowAura); |
| 139 }; | 142 }; |
| 140 | 143 |
| 141 } // namespace wm | 144 } // namespace wm |
| 142 } // namespace ash | 145 } // namespace ash |
| 143 | 146 |
| 144 #endif // ASH_WM_AURA_WM_WINDOW_AURA_H_ | 147 #endif // ASH_WM_AURA_WM_WINDOW_AURA_H_ |
| OLD | NEW |