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 "extensions/shell/renderer/shell_content_renderer_client.h" | 5 #include "extensions/shell/renderer/shell_content_renderer_client.h" |
6 | 6 |
7 #include "content/public/renderer/render_frame.h" | 7 #include "content/public/renderer/render_frame.h" |
8 #include "content/public/renderer/render_frame_observer.h" | 8 #include "content/public/renderer/render_frame_observer.h" |
9 #include "content/public/renderer/render_frame_observer_tracker.h" | 9 #include "content/public/renderer/render_frame_observer_tracker.h" |
10 #include "content/public/renderer/render_thread.h" | 10 #include "content/public/renderer/render_thread.h" |
11 #include "extensions/common/extensions_client.h" | 11 #include "extensions/common/extensions_client.h" |
12 #include "extensions/renderer/default_dispatcher_delegate.h" | 12 #include "extensions/renderer/default_dispatcher_delegate.h" |
13 #include "extensions/renderer/dispatcher.h" | 13 #include "extensions/renderer/dispatcher.h" |
14 #include "extensions/renderer/extension_helper.h" | 14 #include "extensions/renderer/extension_helper.h" |
15 #include "extensions/renderer/guest_view/guest_view_container.h" | 15 #include "extensions/renderer/guest_view/mime_handler_view_container.h" |
| 16 #include "extensions/renderer/guest_view/web_view_container.h" |
16 #include "extensions/shell/common/shell_extensions_client.h" | 17 #include "extensions/shell/common/shell_extensions_client.h" |
17 #include "extensions/shell/renderer/shell_extensions_renderer_client.h" | 18 #include "extensions/shell/renderer/shell_extensions_renderer_client.h" |
18 #include "third_party/WebKit/public/web/WebLocalFrame.h" | 19 #include "third_party/WebKit/public/web/WebLocalFrame.h" |
19 | 20 |
20 #if !defined(DISABLE_NACL) | 21 #if !defined(DISABLE_NACL) |
21 #include "components/nacl/common/nacl_constants.h" | 22 #include "components/nacl/common/nacl_constants.h" |
22 #include "components/nacl/renderer/nacl_helper.h" | 23 #include "components/nacl/renderer/nacl_helper.h" |
23 #include "components/nacl/renderer/ppb_nacl_private_impl.h" | 24 #include "components/nacl/renderer/ppb_nacl_private_impl.h" |
24 #include "ppapi/c/private/ppb_nacl_private.h" | 25 #include "ppapi/c/private/ppb_nacl_private.h" |
25 #endif | 26 #endif |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 return false; | 169 return false; |
169 #endif | 170 #endif |
170 } | 171 } |
171 | 172 |
172 bool ShellContentRendererClient::ShouldEnableSiteIsolationPolicy() const { | 173 bool ShellContentRendererClient::ShouldEnableSiteIsolationPolicy() const { |
173 // Extension renderers don't need site isolation. | 174 // Extension renderers don't need site isolation. |
174 return false; | 175 return false; |
175 } | 176 } |
176 | 177 |
177 content::BrowserPluginDelegate* | 178 content::BrowserPluginDelegate* |
178 ShellContentRendererClient::CreateBrowserPluginDelegate( | 179 ShellContentRendererClient::CreateWebViewContainer( |
| 180 content::RenderFrame* render_frame) { |
| 181 return new extensions::WebViewContainer(render_frame); |
| 182 } |
| 183 |
| 184 content::BrowserPluginDelegate* |
| 185 ShellContentRendererClient::CreateMimeHandlerViewContainer( |
179 content::RenderFrame* render_frame, | 186 content::RenderFrame* render_frame, |
180 const std::string& mime_type) { | 187 const std::string& mime_type) { |
181 return new extensions::GuestViewContainer(render_frame, mime_type); | 188 return new extensions::MimeHandlerViewContainer(render_frame, mime_type); |
182 } | 189 } |
183 | 190 |
184 } // namespace extensions | 191 } // namespace extensions |
OLD | NEW |