| 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 fa73f7ba1235869ebc196e3f1da289c184b1e772..149de6ff9903c0fac2538af298ea6d9d9e9f721b 100644
|
| --- a/chrome/renderer/chrome_content_renderer_client.cc
|
| +++ b/chrome/renderer/chrome_content_renderer_client.cc
|
| @@ -30,7 +30,6 @@
|
| #include "chrome/grit/locale_settings.h"
|
| #include "chrome/grit/renderer_resources.h"
|
| #include "chrome/renderer/benchmarking_extension.h"
|
| -#include "chrome/renderer/browser_plugin/chrome_browser_plugin_delegate.h"
|
| #include "chrome/renderer/chrome_render_frame_observer.h"
|
| #include "chrome/renderer/chrome_render_process_observer.h"
|
| #include "chrome/renderer/chrome_render_view_observer.h"
|
| @@ -85,6 +84,7 @@
|
| #include "extensions/common/extension_set.h"
|
| #include "extensions/common/extension_urls.h"
|
| #include "extensions/common/switches.h"
|
| +#include "extensions/renderer/guest_view/guest_view_container.h"
|
| #include "ipc/ipc_sync_channel.h"
|
| #include "net/base/net_errors.h"
|
| #include "ppapi/c/private/ppb_nacl_private.h"
|
| @@ -1571,5 +1571,5 @@ content::BrowserPluginDelegate*
|
| ChromeContentRendererClient::CreateBrowserPluginDelegate(
|
| content::RenderFrame* render_frame,
|
| const std::string& mime_type) {
|
| - return new ChromeBrowserPluginDelegate(render_frame, mime_type);
|
| + return new GuestViewContainer(render_frame, mime_type);
|
| }
|
|
|