| 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 "ui/views/controls/native/native_view_host_mac.h" | 5 #include "ui/views/controls/native/native_view_host_mac.h" |
| 6 | 6 |
| 7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
| 8 | 8 |
| 9 #include <memory> |
| 10 |
| 9 #import "base/mac/scoped_nsautorelease_pool.h" | 11 #import "base/mac/scoped_nsautorelease_pool.h" |
| 10 #import "base/mac/scoped_nsobject.h" | 12 #import "base/mac/scoped_nsobject.h" |
| 11 #include "base/macros.h" | 13 #include "base/macros.h" |
| 12 #include "base/memory/scoped_ptr.h" | |
| 13 #import "testing/gtest_mac.h" | 14 #import "testing/gtest_mac.h" |
| 14 #include "ui/views/controls/native/native_view_host.h" | 15 #include "ui/views/controls/native/native_view_host.h" |
| 15 #include "ui/views/controls/native/native_view_host_test_base.h" | 16 #include "ui/views/controls/native/native_view_host_test_base.h" |
| 16 #include "ui/views/view.h" | 17 #include "ui/views/view.h" |
| 17 #include "ui/views/widget/widget.h" | 18 #include "ui/views/widget/widget.h" |
| 18 | 19 |
| 19 namespace views { | 20 namespace views { |
| 20 | 21 |
| 21 class NativeViewHostMacTest : public test::NativeViewHostTestBase { | 22 class NativeViewHostMacTest : public test::NativeViewHostTestBase { |
| 22 public: | 23 public: |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 } | 156 } |
| 156 | 157 |
| 157 // During teardown, NativeViewDetaching() is called in RemovedFromWidget(). | 158 // During teardown, NativeViewDetaching() is called in RemovedFromWidget(). |
| 158 // Just trigger it with Detach(). | 159 // Just trigger it with Detach(). |
| 159 host()->Detach(); | 160 host()->Detach(); |
| 160 | 161 |
| 161 DestroyHost(); | 162 DestroyHost(); |
| 162 } | 163 } |
| 163 | 164 |
| 164 } // namespace views | 165 } // namespace views |
| OLD | NEW |