diff options
| author | fsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-16 23:40:21 +0000 |
|---|---|---|
| committer | fsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-16 23:40:21 +0000 |
| commit | 095ebc0296c06705c7e76a008cffd3d824ad83bd (patch) | |
| tree | 7c4d30637245844181e0d05a5613062d7e0974b9 /content/renderer | |
| parent | 3336c15c8aaee7226d3b4cf3e7357084024f9424 (diff) | |
| download | chromium_src-095ebc0296c06705c7e76a008cffd3d824ad83bd.zip chromium_src-095ebc0296c06705c7e76a008cffd3d824ad83bd.tar.gz chromium_src-095ebc0296c06705c7e76a008cffd3d824ad83bd.tar.bz2 | |
Remove ContentRendererClient::AllowBrowserPlugin
BrowserPlugin can no longer create a new WebContents on its own without the chrome layer. Now that BrowserPlugin is inert, ContentRendererClient::AllowBrowserPlugin seems unnecessary.
BUG=364141
Review URL: https://codereview.chromium.org/338493002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277576 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
3 files changed, 0 insertions, 22 deletions
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc index 086b6ab..eec9de9 100644 --- a/content/renderer/browser_plugin/browser_plugin.cc +++ b/content/renderer/browser_plugin/browser_plugin.cc @@ -524,10 +524,6 @@ bool BrowserPlugin::initialize(WebPluginContainer* container) { if (!container) return false; - if (!GetContentClient()->renderer()->AllowBrowserPlugin(container) && - !auto_navigate_) - return false; - // Tell |container| to allow this plugin to use script objects. npp_.reset(new NPP_t); container->allowScriptObjects(); diff --git a/content/renderer/browser_plugin/browser_plugin_browsertest.cc b/content/renderer/browser_plugin/browser_plugin_browsertest.cc index 7eee4b9..4228466 100644 --- a/content/renderer/browser_plugin/browser_plugin_browsertest.cc +++ b/content/renderer/browser_plugin/browser_plugin_browsertest.cc @@ -46,19 +46,6 @@ std::string GetHTMLForBrowserPluginObject() { } // namespace -class TestContentRendererClient : public ContentRendererClient { - public: - TestContentRendererClient() : ContentRendererClient() { - } - virtual ~TestContentRendererClient() { - } - virtual bool AllowBrowserPlugin( - blink::WebPluginContainer* container) OVERRIDE { - // Allow BrowserPlugin for tests. - return true; - } -}; - // Test factory for creating test instances of BrowserPluginManager. class TestBrowserPluginManagerFactory : public BrowserPluginManagerFactory { public: @@ -104,10 +91,6 @@ void BrowserPluginTest::TearDown() { RenderViewTest::TearDown(); } -ContentRendererClient* BrowserPluginTest::CreateContentRendererClient() { - return new TestContentRendererClient; -} - std::string BrowserPluginTest::ExecuteScriptAndReturnString( const std::string& script) { v8::HandleScope handle_scope(v8::Isolate::GetCurrent()); diff --git a/content/renderer/browser_plugin/browser_plugin_browsertest.h b/content/renderer/browser_plugin/browser_plugin_browsertest.h index 415afc3..434da343 100644 --- a/content/renderer/browser_plugin/browser_plugin_browsertest.h +++ b/content/renderer/browser_plugin/browser_plugin_browsertest.h @@ -29,7 +29,6 @@ class BrowserPluginTest : public RenderViewTest { virtual void SetUp() OVERRIDE; virtual void TearDown() OVERRIDE; - virtual ContentRendererClient* CreateContentRendererClient() OVERRIDE; MockBrowserPluginManager* browser_plugin_manager() const { return static_cast<MockBrowserPluginManager*>( |