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 #include "chrome/browser/ui/views/extensions/extension_view_views.h" | 5 #include "chrome/browser/ui/views/extensions/extension_view_views.h" |
6 | 6 |
| 7 #include <utility> |
| 8 |
7 #include "chrome/browser/extensions/extension_view_host.h" | 9 #include "chrome/browser/extensions/extension_view_host.h" |
8 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
10 #include "chrome/browser/ui/views/extensions/extension_popup.h" | 12 #include "chrome/browser/ui/views/extensions/extension_popup.h" |
11 #include "content/public/browser/render_view_host.h" | 13 #include "content/public/browser/render_view_host.h" |
12 #include "content/public/browser/render_widget_host.h" | 14 #include "content/public/browser/render_widget_host.h" |
13 #include "content/public/browser/render_widget_host_view.h" | 15 #include "content/public/browser/render_widget_host_view.h" |
14 #include "content/public/browser/web_contents.h" | 16 #include "content/public/browser/web_contents.h" |
15 #include "extensions/browser/extension_host.h" | 17 #include "extensions/browser/extension_host.h" |
16 #include "extensions/common/view_type.h" | 18 #include "extensions/common/view_type.h" |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 namespace extensions { | 135 namespace extensions { |
134 | 136 |
135 // static | 137 // static |
136 scoped_ptr<ExtensionView> ExtensionViewHost::CreateExtensionView( | 138 scoped_ptr<ExtensionView> ExtensionViewHost::CreateExtensionView( |
137 ExtensionViewHost* host, | 139 ExtensionViewHost* host, |
138 Browser* browser) { | 140 Browser* browser) { |
139 scoped_ptr<ExtensionViewViews> view(new ExtensionViewViews(host, browser)); | 141 scoped_ptr<ExtensionViewViews> view(new ExtensionViewViews(host, browser)); |
140 // We own |view_|, so don't auto delete when it's removed from the view | 142 // We own |view_|, so don't auto delete when it's removed from the view |
141 // hierarchy. | 143 // hierarchy. |
142 view->set_owned_by_client(); | 144 view->set_owned_by_client(); |
143 return view.Pass(); | 145 return std::move(view); |
144 } | 146 } |
145 | 147 |
146 } // namespace extensions | 148 } // namespace extensions |
OLD | NEW |