diff options
| author | thestig <thestig@chromium.org> | 2014-08-25 17:32:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-26 00:35:05 +0000 |
| commit | 11b815e9520584215b940e28c7c8f121d7a7afad (patch) | |
| tree | fb96b07c1695a7395495bfadcde7056dd677bfbd /chrome/browser/browser_process_impl.cc | |
| parent | f032b471042c2a93d504c5fdeb8a685dd06e8962 (diff) | |
| download | chromium_src-11b815e9520584215b940e28c7c8f121d7a7afad.zip chromium_src-11b815e9520584215b940e28c7c8f121d7a7afad.tar.gz chromium_src-11b815e9520584215b940e28c7c8f121d7a7afad.tar.bz2 | |
Only build various flash/pnacl/ppapi code when they are enabled. (try 2)
Review URL: https://codereview.chromium.org/494993005
Cr-Commit-Position: refs/heads/master@{#291810}
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index c379704..b178721 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -29,7 +29,6 @@ #include "chrome/browser/chrome_content_browser_client.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/component_updater/chrome_component_updater_configurator.h" -#include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" #include "chrome/browser/defaults.h" #include "chrome/browser/devtools/remote_debugging_server.h" #include "chrome/browser/download/download_request_limiter.h" @@ -129,6 +128,10 @@ #include "components/storage_monitor/storage_monitor.h" #endif +#if !defined(DISABLE_NACL) +#include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" +#endif + #if defined(ENABLE_PLUGIN_INSTALLATION) #include "chrome/browser/plugins/plugins_resource_service.h" #endif @@ -901,11 +904,15 @@ CRLSetFetcher* BrowserProcessImpl::crl_set_fetcher() { component_updater::PnaclComponentInstaller* BrowserProcessImpl::pnacl_component_installer() { +#if !defined(DISABLE_NACL) if (!pnacl_component_installer_.get()) { pnacl_component_installer_.reset( new component_updater::PnaclComponentInstaller()); } return pnacl_component_installer_.get(); +#else + return NULL; +#endif } void BrowserProcessImpl::ResourceDispatcherHostCreated() { |