Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7400)

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 12512009: Fix OOP iframe prototype to allow BrowserPlugin outside webview. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove WebKit prefix. Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 abf4b6f7162a1ddaeea012136fc4a4468a51c02e..43373813ab558a0bc56b30aa74ffffdb413d0fa1 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -1105,6 +1105,10 @@ void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
bool ChromeContentRendererClient::AllowBrowserPlugin(
WebKit::WebPluginContainer* container) const {
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableBrowserPluginForAllViewTypes))
+ return true;
+
// If this |BrowserPlugin| <object> in the |container| is not inside a
// <webview> shadowHost, we disable instantiating this plugin. This is to
// discourage and prevent developers from accidentally attaching <object>
@@ -1120,13 +1124,8 @@ bool ChromeContentRendererClient::AllowBrowserPlugin(
if (container->element().shadowHost().isNull())
return false;
- if (container->element().shadowHost().tagName().equals(
- WebKit::WebString::fromUTF8(kWebViewTagName))) {
- return true;
- } else {
- return CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableBrowserPluginForAllViewTypes);
- }
+ return container->element().shadowHost().tagName().equals(
+ WebString::fromUTF8(kWebViewTagName));
}
} // namespace chrome
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698