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..339cd7a8eecb3fc9561e036ab16597d798b2fee0 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( |
+ WebKit::WebString::fromUTF8(kWebViewTagName)); |
darin (slow to review)
2013/03/18 17:30:48
nit: WebString has a using directive up top.
Charlie Reis
2013/03/18 17:33:13
Done.
|
} |
} // namespace chrome |