Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2817)

Unified Diff: chrome/browser/extensions/chrome_extension_web_contents_observer.cc

Issue 1035263002: Add service registration for Mojo services defined under chrome/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/chrome_extension_web_contents_observer.cc
diff --git a/chrome/browser/extensions/chrome_extension_web_contents_observer.cc b/chrome/browser/extensions/chrome_extension_web_contents_observer.cc
index a407d627d8cb0cfa49bb6c91b9fbe0ec6bd29129..f95a833981cd556d866544748ee0ff3c82d462ee 100644
--- a/chrome/browser/extensions/chrome_extension_web_contents_observer.cc
+++ b/chrome/browser/extensions/chrome_extension_web_contents_observer.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
+#include "chrome/browser/extensions/chrome_mojo_service_registry.h"
#include "chrome/browser/extensions/error_console/error_console.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/common/extensions/chrome_extension_messages.h"
@@ -91,4 +92,16 @@ void ChromeExtensionWebContentsObserver::ReloadIfTerminated(
}
}
+void ChromeExtensionWebContentsObserver::RegisterMojoServices(
+ content::RenderFrameHost* render_frame_host,
mark a. foltz 2015/03/27 20:24:11 What is the relationship between |render_frame_hos
Kevin M 2015/03/27 22:42:37 render_frame_host is created as a result of |web_c
+ const Extension* extension) {
+ DCHECK(render_frame_host);
+ DCHECK(extension);
+
+ ExtensionWebContentsObserver::RegisterMojoServices(render_frame_host,
+ extension);
+
+ RegisterChromeServicesForFrame(render_frame_host, extension);
+}
+
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698