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

Unified Diff: chrome/browser/extensions/chrome_extensions_browser_client.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: Sync with master. 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_extensions_browser_client.cc
diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc
index df88904ca2730a9f8e2016b065e82c1346c5ad37..1e838eaa4a4f78a9e122c3d02b8e488229c86237 100644
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/extensions/chrome_app_sorting.h"
#include "chrome/browser/extensions/chrome_component_extension_resource_manager.h"
#include "chrome/browser/extensions/chrome_extension_host_delegate.h"
+#include "chrome/browser/extensions/chrome_mojo_service_registration.h"
#include "chrome/browser/extensions/chrome_process_manager_delegate.h"
#include "chrome/browser/extensions/chrome_url_request_util.h"
#include "chrome/browser/extensions/event_router_forwarder.h"
@@ -35,6 +36,7 @@
#include "extensions/browser/api/generated_api_registration.h"
#include "extensions/browser/extension_function_registry.h"
#include "extensions/browser/extension_prefs.h"
+#include "extensions/browser/mojo/service_registration.h"
#include "extensions/browser/pref_names.h"
#include "extensions/browser/url_request_util.h"
@@ -256,6 +258,13 @@ void ChromeExtensionsBrowserClient::RegisterExtensionFunctions(
extensions::api::GeneratedFunctionRegistry::RegisterAll(registry);
}
+void ChromeExtensionsBrowserClient::RegisterMojoServices(
+ content::RenderFrameHost* render_frame_host,
+ const Extension* extension) const {
+ RegisterServicesForFrame(render_frame_host, extension);
+ RegisterChromeServicesForFrame(render_frame_host, extension);
+}
+
scoped_ptr<extensions::RuntimeAPIDelegate>
ChromeExtensionsBrowserClient::CreateRuntimeAPIDelegate(
content::BrowserContext* context) const {

Powered by Google App Engine
This is Rietveld 408576698