From 80ffc26713af71356629b8cba87bfb02dc321ead Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Thu, 4 Oct 2018 16:24:43 +1000 Subject: [PATCH] fixme: disable pepper flash --- atom/app/atom_content_client.cc | 2 +- buildflags/buildflags.gni | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/atom/app/atom_content_client.cc b/atom/app/atom_content_client.cc index 8849807b941..4107656c52a 100644 --- a/atom/app/atom_content_client.cc +++ b/atom/app/atom_content_client.cc @@ -210,8 +210,8 @@ void AtomContentClient::AddAdditionalSchemes(Schemes* schemes) { void AtomContentClient::AddPepperPlugins( std::vector* plugins) { - base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); #if BUILDFLAG(ENABLE_PEPPER_FLASH) + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); AddPepperFlashFromCommandLine(command_line, plugins); #endif // BUILDFLAG(ENABLE_PEPPER_FLASH) ComputeBuiltInPlugins(plugins); diff --git a/buildflags/buildflags.gni b/buildflags/buildflags.gni index 2603b7088be..84b1fab3e41 100644 --- a/buildflags/buildflags.gni +++ b/buildflags/buildflags.gni @@ -21,5 +21,5 @@ declare_args() { enable_fake_location_provider = !is_official_build # Enable flash plugin support. - enable_pepper_flash = true + enable_pepper_flash = false }