Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / extensions / browser / extension_web_contents_observer.cc

diff --git a/src/extensions/browser/extension_web_contents_observer.cc b/src/extensions/browser/extension_web_contents_observer.cc
index a66a6f2..0a816ae 100644 (file)
--- a/src/extensions/browser/extension_web_contents_observer.cc
+++ b/src/extensions/browser/extension_web_contents_observer.cc
@@ -12,6 +12,7 @@
 #include "content/public/common/url_constants.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
+#include "extensions/browser/mojo/service_registration_manager.h"
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_messages.h"
@@ -31,6 +32,11 @@ void ExtensionWebContentsObserver::RenderViewCreated(
     content::RenderViewHost* render_view_host) {
   NotifyRenderViewType(render_view_host);
 
+  // TODO(sammc): Call AddServicesToRenderFrame() for frames that aren't main
+  // frames.
+  ServiceRegistrationManager::GetSharedInstance()->AddServicesToRenderFrame(
+      render_view_host->GetMainFrame());
+
   const Extension* extension = GetExtension(render_view_host);
   if (!extension)
     return;