summaryrefslogtreecommitdiffstats
path: root/extensions/shell/renderer
diff options
context:
space:
mode:
authorfsamuel <fsamuel@chromium.org>2014-09-16 02:16:28 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-16 09:19:41 +0000
commit3a3d128e45fb5c63bf7b5cbbf2619e704acc52fd (patch)
treec5931631de928a19e2d22c43b7ebee35f51956ad /extensions/shell/renderer
parent352f1537f3774bb29bb084ad95e30bf52930917a (diff)
downloadchromium_src-3a3d128e45fb5c63bf7b5cbbf2619e704acc52fd.zip
chromium_src-3a3d128e45fb5c63bf7b5cbbf2619e704acc52fd.tar.gz
chromium_src-3a3d128e45fb5c63bf7b5cbbf2619e704acc52fd.tar.bz2
Rename ChromeBrowserPluginDelegate to GuestViewContainer
This CL renames ChromeBrowserPluginDelegate to GuestViewContainer and moves it to extensions This CL moves guest_view_constants to extensions/common/* This CL also attaches a GuestViewContainer to all GuestViews. BUG=330264, 352290 Review URL: https://codereview.chromium.org/577453002 Cr-Commit-Position: refs/heads/master@{#295034}
Diffstat (limited to 'extensions/shell/renderer')
-rw-r--r--extensions/shell/renderer/shell_content_renderer_client.cc8
-rw-r--r--extensions/shell/renderer/shell_content_renderer_client.h3
2 files changed, 11 insertions, 0 deletions
diff --git a/extensions/shell/renderer/shell_content_renderer_client.cc b/extensions/shell/renderer/shell_content_renderer_client.cc
index 8525983..bca7dca 100644
--- a/extensions/shell/renderer/shell_content_renderer_client.cc
+++ b/extensions/shell/renderer/shell_content_renderer_client.cc
@@ -12,6 +12,7 @@
#include "extensions/renderer/default_dispatcher_delegate.h"
#include "extensions/renderer/dispatcher.h"
#include "extensions/renderer/extension_helper.h"
+#include "extensions/renderer/guest_view/guest_view_container.h"
#include "extensions/shell/common/shell_extensions_client.h"
#include "extensions/shell/renderer/shell_extensions_renderer_client.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"
@@ -173,4 +174,11 @@ bool ShellContentRendererClient::ShouldEnableSiteIsolationPolicy() const {
return false;
}
+content::BrowserPluginDelegate*
+ShellContentRendererClient::CreateBrowserPluginDelegate(
+ content::RenderFrame* render_frame,
+ const std::string& mime_type) {
+ return new extensions::GuestViewContainer(render_frame, mime_type);
+}
+
} // namespace extensions
diff --git a/extensions/shell/renderer/shell_content_renderer_client.h b/extensions/shell/renderer/shell_content_renderer_client.h
index 94b7bb1..d9c4197 100644
--- a/extensions/shell/renderer/shell_content_renderer_client.h
+++ b/extensions/shell/renderer/shell_content_renderer_client.h
@@ -48,6 +48,9 @@ class ShellContentRendererClient : public content::ContentRendererClient {
const std::string& interface_name) OVERRIDE;
virtual bool IsExternalPepperPlugin(const std::string& module_name) OVERRIDE;
virtual bool ShouldEnableSiteIsolationPolicy() const OVERRIDE;
+ virtual content::BrowserPluginDelegate* CreateBrowserPluginDelegate(
+ content::RenderFrame* render_frame,
+ const std::string& mime_type) OVERRIDE;
private:
scoped_ptr<ShellExtensionsClient> extensions_client_;