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 fa73f7ba1235869ebc196e3f1da289c184b1e772..9ce12cbf943aed542fe4cddbf5708f5578aed92b 100644 |
--- a/chrome/renderer/chrome_content_renderer_client.cc |
+++ b/chrome/renderer/chrome_content_renderer_client.cc |
@@ -35,7 +35,6 @@ |
#include "chrome/renderer/chrome_render_process_observer.h" |
#include "chrome/renderer/chrome_render_view_observer.h" |
#include "chrome/renderer/content_settings_observer.h" |
-#include "chrome/renderer/extensions/chrome_extensions_renderer_client.h" |
#include "chrome/renderer/external_extension.h" |
#include "chrome/renderer/loadtimes_extension_bindings.h" |
#include "chrome/renderer/media/cast_ipc_dispatcher.h" |
@@ -116,6 +115,7 @@ |
#if defined(ENABLE_EXTENSIONS) |
#include "chrome/renderer/extensions/chrome_extension_helper.h" |
#include "chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h" |
+#include "chrome/renderer/extensions/chrome_extensions_renderer_client.h" |
#include "chrome/renderer/extensions/extension_frame_helper.h" |
#include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h" |
#include "chrome/renderer/extensions/resource_request_policy.h" |
@@ -271,8 +271,10 @@ ChromeContentRendererClient::ChromeContentRendererClient() { |
extensions::ExtensionsClient::Set( |
extensions::ChromeExtensionsClient::GetInstance()); |
+#if defined(ENABLE_EXTENSIONS) |
extensions::ExtensionsRendererClient::Set( |
ChromeExtensionsRendererClient::GetInstance()); |
+#endif |
#if defined(ENABLE_PLUGINS) |
for (size_t i = 0; i < arraysize(kPredefinedAllowedCompositorOrigins); ++i) |
allowed_compositor_origins_.insert(kPredefinedAllowedCompositorOrigins[i]); |