github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-08 23:18:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixme: disable pepper flash

Browse Source
This commit is contained in:
Samuel Attard
2018-10-04 16:24:43 +10:00
committed by Jeremy Apthorp
parent 7aa01bc00a
commit 80ffc26713
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
atom/app/atom_content_client.cc
View File

@@ -210,8 +210,8 @@ void AtomContentClient::AddAdditionalSchemes(Schemes* schemes) {
void AtomContentClient::AddPepperPlugins( void AtomContentClient::AddPepperPlugins(
std::vector<content::PepperPluginInfo>* plugins) { std::vector<content::PepperPluginInfo>* plugins) {
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
#if BUILDFLAG(ENABLE_PEPPER_FLASH) #if BUILDFLAG(ENABLE_PEPPER_FLASH)
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
AddPepperFlashFromCommandLine(command_line, plugins); AddPepperFlashFromCommandLine(command_line, plugins);
#endif // BUILDFLAG(ENABLE_PEPPER_FLASH) #endif // BUILDFLAG(ENABLE_PEPPER_FLASH)
ComputeBuiltInPlugins(plugins); ComputeBuiltInPlugins(plugins);

2
buildflags/buildflags.gni
View File

@@ -21,5 +21,5 @@ declare_args() {
enable_fake_location_provider = !is_official_build enable_fake_location_provider = !is_official_build
# Enable flash plugin support. # Enable flash plugin support.
enable_pepper_flash = true enable_pepper_flash = false
} }