OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 UI_VIEWS_WIDGET_WINDOW_REORDERER_H_ | 5 #ifndef UI_VIEWS_WIDGET_WINDOW_REORDERER_H_ |
6 #define UI_VIEWS_WIDGET_WINDOW_REORDERER_H_ | 6 #define UI_VIEWS_WIDGET_WINDOW_REORDERER_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
9 #include "base/macros.h" | 11 #include "base/macros.h" |
10 #include "base/memory/scoped_ptr.h" | |
11 #include "ui/aura/window_observer.h" | 12 #include "ui/aura/window_observer.h" |
12 | 13 |
13 namespace aura { | 14 namespace aura { |
14 class Window; | 15 class Window; |
15 } | 16 } |
16 | 17 |
17 namespace views { | 18 namespace views { |
18 class View; | 19 class View; |
19 | 20 |
20 // Class which reorders the widget's child windows which have an associated view | 21 // Class which reorders the widget's child windows which have an associated view |
(...skipping 22 matching lines...) Expand all Loading... |
43 void OnWindowDestroying(aura::Window* window) override; | 44 void OnWindowDestroying(aura::Window* window) override; |
44 | 45 |
45 // The window and the root view of the native widget which owns the | 46 // The window and the root view of the native widget which owns the |
46 // WindowReorderer. | 47 // WindowReorderer. |
47 aura::Window* parent_window_; | 48 aura::Window* parent_window_; |
48 View* root_view_; | 49 View* root_view_; |
49 | 50 |
50 // Reorders windows as a result of the kHostViewKey being set on a child of | 51 // Reorders windows as a result of the kHostViewKey being set on a child of |
51 // |parent_window_|. | 52 // |parent_window_|. |
52 class AssociationObserver; | 53 class AssociationObserver; |
53 scoped_ptr<AssociationObserver> association_observer_; | 54 std::unique_ptr<AssociationObserver> association_observer_; |
54 | 55 |
55 DISALLOW_COPY_AND_ASSIGN(WindowReorderer); | 56 DISALLOW_COPY_AND_ASSIGN(WindowReorderer); |
56 }; | 57 }; |
57 | 58 |
58 } // namespace views | 59 } // namespace views |
59 | 60 |
60 #endif // UI_VIEWS_WIDGET_WINDOW_REORDERER_H_ | 61 #endif // UI_VIEWS_WIDGET_WINDOW_REORDERER_H_ |
OLD | NEW |