OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ | 5 #ifndef ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ |
6 #define ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ | 6 #define ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
9 #include "base/macros.h" | 11 #include "base/macros.h" |
10 #include "base/memory/scoped_ptr.h" | |
11 #include "third_party/skia/include/core/SkColor.h" | 12 #include "third_party/skia/include/core/SkColor.h" |
12 #include "ui/views/window/non_client_view.h" | 13 #include "ui/views/window/non_client_view.h" |
13 | 14 |
14 namespace ash { | 15 namespace ash { |
15 class FrameBorderHitTestController; | 16 class FrameBorderHitTestController; |
16 class FrameCaptionButtonContainerView; | 17 class FrameCaptionButtonContainerView; |
17 class ImmersiveFullscreenController; | 18 class ImmersiveFullscreenController; |
18 } | 19 } |
19 namespace views { | 20 namespace views { |
20 class Widget; | 21 class Widget; |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 int NonClientTopBorderHeight() const; | 88 int NonClientTopBorderHeight() const; |
88 | 89 |
89 // Not owned. | 90 // Not owned. |
90 views::Widget* frame_; | 91 views::Widget* frame_; |
91 | 92 |
92 // View which contains the title and window controls. | 93 // View which contains the title and window controls. |
93 class HeaderView; | 94 class HeaderView; |
94 HeaderView* header_view_; | 95 HeaderView* header_view_; |
95 | 96 |
96 // Updates the hittest bounds overrides based on the window state type. | 97 // Updates the hittest bounds overrides based on the window state type. |
97 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_; | 98 std::unique_ptr<FrameBorderHitTestController> |
| 99 frame_border_hit_test_controller_; |
98 | 100 |
99 DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh); | 101 DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh); |
100 }; | 102 }; |
101 | 103 |
102 } // namespace ash | 104 } // namespace ash |
103 | 105 |
104 #endif // ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ | 106 #endif // ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ |
OLD | NEW |