| Index: chrome/common/chrome_content_client.cc
|
| diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
|
| index c577edf5507b7d886645f1b9f874816cd75c6c09..3b9b5f823c3ed361476753c9382c1c78ddeec59f 100644
|
| --- a/chrome/common/chrome_content_client.cc
|
| +++ b/chrome/common/chrome_content_client.cc
|
| @@ -74,12 +74,14 @@
|
| namespace {
|
|
|
| #if defined(ENABLE_PLUGINS)
|
| +#if defined(ENABLE_PDF)
|
| const char kPDFPluginExtension[] = "pdf";
|
| const char kPDFPluginDescription[] = "Portable Document Format";
|
| const char kPDFPluginOutOfProcessMimeType[] =
|
| "application/x-google-chrome-pdf";
|
| const uint32 kPDFPluginPermissions = ppapi::PERMISSION_PRIVATE |
|
| ppapi::PERMISSION_DEV;
|
| +#endif // defined(ENABLE_PDF)
|
|
|
| content::PepperPluginInfo::GetInterfaceFunc g_pdf_get_interface;
|
| content::PepperPluginInfo::PPP_InitializeModuleFunc g_pdf_initialize_module;
|
| @@ -97,6 +99,7 @@ content::PepperPluginInfo::PPP_ShutdownModuleFunc g_nacl_shutdown_module;
|
| // not marked internal, aside from being automatically registered, they're just
|
| // regular plugins).
|
| void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
|
| +#if defined(ENABLE_PDF)
|
| content::PepperPluginInfo pdf_info;
|
| pdf_info.is_internal = true;
|
| pdf_info.is_out_of_process = true;
|
| @@ -114,6 +117,7 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
|
| pdf_info.internal_entry_points.shutdown_module = g_pdf_shutdown_module;
|
| pdf_info.permissions = kPDFPluginPermissions;
|
| plugins->push_back(pdf_info);
|
| +#endif // defined(ENABLE_PDF)
|
|
|
| base::FilePath path;
|
|
|
|
|