| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include <memory> |
| 6 |
| 5 #include "base/macros.h" | 7 #include "base/macros.h" |
| 6 #include "base/memory/scoped_ptr.h" | |
| 7 #include "ui/views/test/views_test_base.h" | 8 #include "ui/views/test/views_test_base.h" |
| 8 | 9 |
| 9 namespace views { | 10 namespace views { |
| 10 | 11 |
| 11 class NativeViewHost; | 12 class NativeViewHost; |
| 12 class NativeViewHostWrapper; | 13 class NativeViewHostWrapper; |
| 13 class Widget; | 14 class Widget; |
| 14 | 15 |
| 15 namespace test { | 16 namespace test { |
| 16 | 17 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 47 | 48 |
| 48 NativeViewHost* host() { return host_.get(); } | 49 NativeViewHost* host() { return host_.get(); } |
| 49 void DestroyHost(); | 50 void DestroyHost(); |
| 50 NativeViewHost* ReleaseHost(); | 51 NativeViewHost* ReleaseHost(); |
| 51 | 52 |
| 52 NativeViewHostWrapper* GetNativeWrapper(); | 53 NativeViewHostWrapper* GetNativeWrapper(); |
| 53 | 54 |
| 54 private: | 55 private: |
| 55 class NativeViewHostTesting; | 56 class NativeViewHostTesting; |
| 56 | 57 |
| 57 scoped_ptr<Widget> toplevel_; | 58 std::unique_ptr<Widget> toplevel_; |
| 58 scoped_ptr<NativeViewHost> host_; | 59 std::unique_ptr<NativeViewHost> host_; |
| 59 int host_destroyed_count_; | 60 int host_destroyed_count_; |
| 60 | 61 |
| 61 DISALLOW_COPY_AND_ASSIGN(NativeViewHostTestBase); | 62 DISALLOW_COPY_AND_ASSIGN(NativeViewHostTestBase); |
| 62 }; | 63 }; |
| 63 | 64 |
| 64 } // namespace test | 65 } // namespace test |
| 65 } // namespace views | 66 } // namespace views |
| OLD | NEW |