| Index: chrome/renderer/chrome_content_renderer_client.cc
|
| diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
|
| index baf68d88631f6f9776c7b81e7efb2ad8e5f6c51b..2be6bdc8fe80640803188f351c520ae7e77a3dba 100644
|
| --- a/chrome/renderer/chrome_content_renderer_client.cc
|
| +++ b/chrome/renderer/chrome_content_renderer_client.cc
|
| @@ -704,7 +704,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
| break;
|
| }
|
| case ChromeViewHostMsg_GetPluginInfo_Status::kAllowed: {
|
| -#if !defined(DISABLE_NACL)
|
| +#if !defined(DISABLE_NACL) && defined(ENABLE_EXTENSIONS)
|
| const bool is_nacl_plugin =
|
| plugin.name == ASCIIToUTF16(nacl::kNaClPluginName);
|
| const bool is_nacl_mime_type =
|
| @@ -769,7 +769,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
| break;
|
| }
|
| }
|
| -#endif // !defined(DISABLE_NACL)
|
| +#endif // !defined(DISABLE_NACL) && defined(ENABLE_EXTENSIONS)
|
|
|
| // Delay loading plugins if prerendering.
|
| // TODO(mmenke): In the case of prerendering, feed into
|
|
|