mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #2105 from deepak1556/ppapi_browser_patch

Browse source 
plugin: dont check renderer flags for adding pepper browser host filters
This commit is contained in:
Cheng Zhao 2015-07-05 22:54:35 +08:00
commit 0e888ccf22
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/atom_browser_client.cc
View file

@ -215,11 +215,8 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
void AtomBrowserClient::DidCreatePpapiPlugin( void AtomBrowserClient::DidCreatePpapiPlugin(
content::BrowserPpapiHost* host) { content::BrowserPpapiHost* host) {
auto command_line = base::CommandLine::ForCurrentProcess(); host->GetPpapiHost()->AddHostFactoryFilter(
if (command_line->HasSwitch(switches::kEnablePlugins)) { make_scoped_ptr(new chrome::ChromeBrowserPepperHostFactory(host)));
host->GetPpapiHost()->AddHostFactoryFilter(
make_scoped_ptr(new chrome::ChromeBrowserPepperHostFactory(host)));
}
} }
content::QuotaPermissionContext* content::QuotaPermissionContext*