diff options
| author | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-28 16:23:33 +0000 |
|---|---|---|
| committer | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-28 16:23:33 +0000 |
| commit | 927da9e281143a55ee8a70033f2b826d0b462aaa (patch) | |
| tree | fae86c227cc2a3731e90c091ae7c1fb0e0bacd64 /chrome/browser/chrome_browser_main.cc | |
| parent | a6c2d13dbd56e31e4028cf169c705093e51d95d2 (diff) | |
| download | chromium_src-927da9e281143a55ee8a70033f2b826d0b462aaa.zip chromium_src-927da9e281143a55ee8a70033f2b826d0b462aaa.tar.gz chromium_src-927da9e281143a55ee8a70033f2b826d0b462aaa.tar.bz2 | |
Fix nacl_process_host.h includes.
This file should never be included when DISABLE_NACL is defined. Erroneous
includes of this file caused problems interacting with the native_client/
source from components/nacl.
I tested this change locally with a disable_nacl=1 build.
BUG=none
R=mseaborn@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/421613002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main.cc')
| -rw-r--r-- | chrome/browser/chrome_browser_main.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index 7c70ea5..abf4a97 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -106,7 +106,6 @@ #include "components/language_usage_metrics/language_usage_metrics.h" #include "components/metrics/metrics_service.h" #include "components/nacl/browser/nacl_browser.h" -#include "components/nacl/browser/nacl_process_host.h" #include "components/rappor/rappor_service.h" #include "components/signin/core/common/profile_management_switches.h" #include "components/startup_metric_utils/startup_metric_utils.h" @@ -187,6 +186,10 @@ #include "chrome/browser/component_updater/cld_component_installer.h" #endif +#if !defined(DISABLE_NACL) +#include "components/nacl/browser/nacl_process_host.h" +#endif + #if defined(ENABLE_FULL_PRINTING) && !defined(OFFICIAL_BUILD) #include "printing/printed_document.h" #endif |