diff options
| author | hshi <hshi@chromium.org> | 2015-08-28 17:14:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-29 00:15:33 +0000 |
| commit | 11e9711134d075bef1580c56f189ae5e1ab3c034 (patch) | |
| tree | 14c8a217fff1641d3b18eafa4e712c02539da7b9 /content/browser/child_process_launcher.cc | |
| parent | 7d0984c64e7e43dce429b3e928f8cfba5e0d0783 (diff) | |
| download | chromium_src-11e9711134d075bef1580c56f189ae5e1ab3c034.zip chromium_src-11e9711134d075bef1580c56f189ae5e1ab3c034.tar.gz chromium_src-11e9711134d075bef1580c56f189ae5e1ab3c034.tar.bz2 | |
Always use ENABLE_PLUGINS to indicate plugins support.
We should rely on GYP_DEFINE "enable_plugins" in gyp files and C++ macro
"ENABLE_PLUGINS" in source code to indicate plugins support. This removes
hard-coded assumptions that certain OS does (or does not) support plugins.
Also add GYP_DEFINE "enable_pdf" and macro "ENABLE_PDF" to indicate
built-in PDF viewer plugin support.
BUG=490433
TEST=trybot
TBR=sievers@chromium.org
Review URL: https://codereview.chromium.org/1318143002
Cr-Commit-Position: refs/heads/master@{#346284}
Diffstat (limited to 'content/browser/child_process_launcher.cc')
| -rw-r--r-- | content/browser/child_process_launcher.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc index 0abbc60..4804349 100644 --- a/content/browser/child_process_launcher.cc +++ b/content/browser/child_process_launcher.cc @@ -372,6 +372,9 @@ void ChildProcessLauncher::Launch( cmd_line->GetSwitchValueASCII(switches::kProcessType); CHECK(process_type == switches::kGpuProcess || process_type == switches::kRendererProcess || +#if defined(ENABLE_PLUGINS) + process_type == switches::kPpapiPluginProcess || +#endif process_type == switches::kUtilityProcess) << "Unsupported process type: " << process_type; |