Chromium Code Reviews| Index: chrome/renderer/chrome_content_renderer_client.cc |
| diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc |
| index 9f99262d1107d5279a117484abf56333be0263a1..7a723b1d3fc74f21e9a316f2fdf331f9bff71e89 100644 |
| --- a/chrome/renderer/chrome_content_renderer_client.cc |
| +++ b/chrome/renderer/chrome_content_renderer_client.cc |
| @@ -120,7 +120,8 @@ |
| #include "extensions/renderer/dispatcher.h" |
| #include "extensions/renderer/extension_helper.h" |
| #include "extensions/renderer/extensions_render_frame_observer.h" |
| -#include "extensions/renderer/guest_view/guest_view_container.h" |
| +#include "extensions/renderer/guest_view/mime_handler_view_container.h" |
| +#include "extensions/renderer/guest_view/web_view_container.h" |
| #include "extensions/renderer/script_context.h" |
| #endif |
| @@ -1583,11 +1584,21 @@ bool ChromeContentRendererClient::IsPluginAllowedToUseVideoDecodeAPI( |
| } |
| content::BrowserPluginDelegate* |
| -ChromeContentRendererClient::CreateBrowserPluginDelegate( |
| +ChromeContentRendererClient::CreateWebViewContainer( |
|
Fady Samuel
2014/11/03 11:03:37
Content should not know the distinction between Mi
raymes
2014/11/03 22:51:31
Done.
|
| + content::RenderFrame* render_frame) { |
| +#if defined(ENABLE_EXTENSIONS) |
| + return new extensions::WebViewContainer(render_frame); |
| +#else |
| + return NULL; |
| +#endif |
| +} |
| + |
| +content::BrowserPluginDelegate* |
| +ChromeContentRendererClient::CreateMimeHandlerViewContainer( |
| content::RenderFrame* render_frame, |
| const std::string& mime_type) { |
| #if defined(ENABLE_EXTENSIONS) |
| - return new extensions::GuestViewContainer(render_frame, mime_type); |
| + return new extensions::MimeHandlerViewContainer(render_frame, mime_type); |
| #else |
| return NULL; |
| #endif |