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

Unified Diff: content/browser/plugin_service_impl.cc

Issue 11772005: Implement a prototype to render cross-site iframes in a separate process from their parent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with ToT. Created 7 years, 11 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 | « content/browser/loader/resource_loader.cc ('k') | content/browser/renderer_host/render_view_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/plugin_service_impl.cc
diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc
index 2cd2eb16f94dd83f7952e49e1f4fe5ec459f2db5..9b90fe08e797fc5f831e11d3c796597744a08d14 100644
--- a/content/browser/plugin_service_impl.cc
+++ b/content/browser/plugin_service_impl.cc
@@ -147,10 +147,27 @@ void PluginServiceImpl::Init() {
RegisterPepperPlugins();
+ // The --site-per-process flag enables an out-of-process iframes
+ // prototype, which uses WebView for rendering. We need to register the MIME
+ // type we use with the plugin, so the renderer can instantiate it.
+ const CommandLine* command_line = CommandLine::ForCurrentProcess();
+ if (command_line->HasSwitch(switches::kSitePerProcess)) {
+ webkit::WebPluginInfo webview_plugin(
+ ASCIIToUTF16("WebView Tag"),
+ FilePath(FILE_PATH_LITERAL("")),
+ ASCIIToUTF16("1.2.3.4"),
+ ASCIIToUTF16("Browser Plugin."));
+ webview_plugin.type = webkit::WebPluginInfo::PLUGIN_TYPE_NPAPI;
+ webkit::WebPluginMimeType webview_plugin_mime_type;
+ webview_plugin_mime_type.mime_type = "application/browser-plugin";
+ webview_plugin_mime_type.file_extensions.push_back("*");
+ webview_plugin.mime_types.push_back(webview_plugin_mime_type);
+ RegisterInternalPlugin(webview_plugin, true);
+ }
+
GetContentClient()->AddNPAPIPlugins(plugin_list_);
// Load any specified on the command line as well.
- const CommandLine* command_line = CommandLine::ForCurrentProcess();
FilePath path = command_line->GetSwitchValuePath(switches::kLoadPlugin);
if (!path.empty())
AddExtraPluginPath(path);
« no previous file with comments | « content/browser/loader/resource_loader.cc ('k') | content/browser/renderer_host/render_view_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698