build: move pepper flash behind feature flag
This commit is contained in:
parent
8ccb5cc6eb
commit
5e2406081e
33 changed files with 39 additions and 2695 deletions
|
@ -32,7 +32,6 @@
|
|||
#include "base/strings/string_number_conversions.h"
|
||||
#include "base/strings/string_util.h"
|
||||
#include "chrome/browser/printing/printing_message_filter.h"
|
||||
#include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
|
||||
#include "chrome/browser/speech/tts_message_filter.h"
|
||||
#include "content/public/browser/browser_ppapi_host.h"
|
||||
#include "content/public/browser/client_certificate_delegate.h"
|
||||
|
@ -62,6 +61,10 @@
|
|||
#include "net/ssl/client_cert_store.h"
|
||||
#endif
|
||||
|
||||
#if defined(ENABLE_PEPPER_FLASH)
|
||||
#include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
|
||||
#endif // defined(ENABLE_PEPPER_FLASH)
|
||||
|
||||
using content::BrowserThread;
|
||||
|
||||
namespace atom {
|
||||
|
@ -349,8 +352,10 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
|
|||
}
|
||||
|
||||
void AtomBrowserClient::DidCreatePpapiPlugin(content::BrowserPpapiHost* host) {
|
||||
#if defined(ENABLE_PEPPER_FLASH)
|
||||
host->GetPpapiHost()->AddHostFactoryFilter(
|
||||
base::WrapUnique(new chrome::ChromeBrowserPepperHostFactory(host)));
|
||||
base::WrapUnique(new ChromeBrowserPepperHostFactory(host)));
|
||||
#endif
|
||||
}
|
||||
|
||||
void AtomBrowserClient::GetGeolocationRequestContext(
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
#include "base/command_line.h"
|
||||
#include "base/strings/string_split.h"
|
||||
#include "chrome/renderer/media/chrome_key_systems.h"
|
||||
#include "chrome/renderer/pepper/pepper_helper.h"
|
||||
#include "chrome/renderer/printing/print_web_view_helper.h"
|
||||
#include "chrome/renderer/tts_dispatcher.h"
|
||||
#include "content/public/common/content_constants.h"
|
||||
|
@ -46,6 +45,10 @@
|
|||
#include "atom/common/atom_constants.h"
|
||||
#endif // defined(ENABLE_PDF_VIEWER)
|
||||
|
||||
#if defined(ENABLE_PEPPER_FLASH)
|
||||
#include "chrome/renderer/pepper/pepper_helper.h"
|
||||
#endif // defined(ENABLE_PEPPER_FLASH)
|
||||
|
||||
namespace atom {
|
||||
|
||||
namespace {
|
||||
|
@ -148,7 +151,9 @@ void RendererClientBase::RenderFrameCreated(
|
|||
#if defined(TOOLKIT_VIEWS)
|
||||
new AutofillAgent(render_frame);
|
||||
#endif
|
||||
#if defined(ENABLE_PEPPER_FLASH)
|
||||
new PepperHelper(render_frame);
|
||||
#endif
|
||||
new ContentSettingsObserver(render_frame);
|
||||
new printing::PrintWebViewHelper(render_frame);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue