| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_CONTROLS_NATIVE_NATIVE_VIEW_HOST_AURA_H_ | 5 #ifndef UI_VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_AURA_H_ |
| 6 #define UI_VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_AURA_H_ | 6 #define UI_VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_AURA_H_ |
| 7 | 7 |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "ui/aura/window.h" | 10 #include "ui/aura/window.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 // its old parent, so that the fast resize path works. | 50 // its old parent, so that the fast resize path works. |
| 51 void AddClippingWindow(); | 51 void AddClippingWindow(); |
| 52 | 52 |
| 53 // If the native view has been reparented via AddClippingWindow, this call | 53 // If the native view has been reparented via AddClippingWindow, this call |
| 54 // undoes it. | 54 // undoes it. |
| 55 void RemoveClippingWindow(); | 55 void RemoveClippingWindow(); |
| 56 | 56 |
| 57 // Our associated NativeViewHost. | 57 // Our associated NativeViewHost. |
| 58 NativeViewHost* host_; | 58 NativeViewHost* host_; |
| 59 | 59 |
| 60 scoped_ptr<ClippingWindowDelegate> clipping_window_delegate_; | 60 std::unique_ptr<ClippingWindowDelegate> clipping_window_delegate_; |
| 61 | 61 |
| 62 // Window that exists between the native view and the parent that allows for | 62 // Window that exists between the native view and the parent that allows for |
| 63 // clipping to occur. This is positioned in the coordinate space of | 63 // clipping to occur. This is positioned in the coordinate space of |
| 64 // host_->GetWidget(). | 64 // host_->GetWidget(). |
| 65 aura::Window clipping_window_; | 65 aura::Window clipping_window_; |
| 66 scoped_ptr<gfx::Rect> clip_rect_; | 66 std::unique_ptr<gfx::Rect> clip_rect_; |
| 67 | 67 |
| 68 DISALLOW_COPY_AND_ASSIGN(NativeViewHostAura); | 68 DISALLOW_COPY_AND_ASSIGN(NativeViewHostAura); |
| 69 }; | 69 }; |
| 70 | 70 |
| 71 } // namespace views | 71 } // namespace views |
| 72 | 72 |
| 73 #endif // UI_VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_AURA_H_ | 73 #endif // UI_VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_AURA_H_ |
| OLD | NEW |