diff options
| author | sammc <sammc@chromium.org> | 2016-03-23 18:44:15 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-24 01:45:51 +0000 |
| commit | 3f06742ebe125991b2c893638063cf8df55d8a86 (patch) | |
| tree | ad125b4d99cabe9ef3aede0e6588857859ae6a92 /extensions/renderer | |
| parent | 2ff45195a56ea8230c9bb0ca39d55a68d2955b85 (diff) | |
| download | chromium_src-3f06742ebe125991b2c893638063cf8df55d8a86.zip chromium_src-3f06742ebe125991b2c893638063cf8df55d8a86.tar.gz chromium_src-3f06742ebe125991b2c893638063cf8df55d8a86.tar.bz2 | |
Make the process-wide ServiceRegistry available to JS.
BUG=597465
Review URL: https://codereview.chromium.org/1827473002
Cr-Commit-Position: refs/heads/master@{#383008}
Diffstat (limited to 'extensions/renderer')
6 files changed, 6 insertions, 6 deletions
diff --git a/extensions/renderer/api_test_base.cc b/extensions/renderer/api_test_base.cc index 79f95e2..81ec07f 100644 --- a/extensions/renderer/api_test_base.cc +++ b/extensions/renderer/api_test_base.cc @@ -165,7 +165,7 @@ void ApiTestEnvironment::RegisterModules() { service_provider_ = service_provider.get(); gin::ModuleRegistry::From(env()->context()->v8_context()) ->AddBuiltinModule(env()->isolate(), - "content/public/renderer/service_provider", + "content/public/renderer/frame_service_registry", service_provider.ToV8()); } diff --git a/extensions/renderer/resources/keep_alive.js b/extensions/renderer/resources/keep_alive.js index aa5f6a0..5269c30 100644 --- a/extensions/renderer/resources/keep_alive.js +++ b/extensions/renderer/resources/keep_alive.js @@ -3,7 +3,7 @@ // found in the LICENSE file. define('keep_alive', [ - 'content/public/renderer/service_provider', + 'content/public/renderer/frame_service_registry', 'extensions/common/mojo/keep_alive.mojom', 'mojo/public/js/core', ], function(serviceProvider, mojom, core) { diff --git a/extensions/renderer/resources/media_router_bindings.js b/extensions/renderer/resources/media_router_bindings.js index e7f32d8..85685c6 100644 --- a/extensions/renderer/resources/media_router_bindings.js +++ b/extensions/renderer/resources/media_router_bindings.js @@ -7,7 +7,7 @@ var mediaRouter; define('media_router_bindings', [ 'mojo/public/js/bindings', 'mojo/public/js/core', - 'content/public/renderer/service_provider', + 'content/public/renderer/frame_service_registry', 'chrome/browser/media/router/media_router.mojom', 'extensions/common/mojo/keep_alive.mojom', 'mojo/public/js/connection', diff --git a/extensions/renderer/resources/mime_handler_private_custom_bindings.js b/extensions/renderer/resources/mime_handler_private_custom_bindings.js index bd7eddd..8e9eb20 100644 --- a/extensions/renderer/resources/mime_handler_private_custom_bindings.js +++ b/extensions/renderer/resources/mime_handler_private_custom_bindings.js @@ -13,7 +13,7 @@ var NO_STREAM_ERROR = var STREAM_ABORTED_ERROR = 'Stream has been aborted.'; var servicePromise = Promise.all([ - requireAsync('content/public/renderer/service_provider'), + requireAsync('content/public/renderer/frame_service_registry'), requireAsync('extensions/common/api/mime_handler.mojom'), requireAsync('mojo/public/js/router'), ]).then(function(modules) { diff --git a/extensions/renderer/resources/serial_service.js b/extensions/renderer/resources/serial_service.js index 015a742..26b990b 100644 --- a/extensions/renderer/resources/serial_service.js +++ b/extensions/renderer/resources/serial_service.js @@ -3,7 +3,7 @@ // found in the LICENSE file. define('serial_service', [ - 'content/public/renderer/service_provider', + 'content/public/renderer/frame_service_registry', 'data_receiver', 'data_sender', 'device/serial/serial.mojom', diff --git a/extensions/renderer/resources/stash_client.js b/extensions/renderer/resources/stash_client.js index 56f289f..240a676 100644 --- a/extensions/renderer/resources/stash_client.js +++ b/extensions/renderer/resources/stash_client.js @@ -4,7 +4,7 @@ define('stash_client', [ 'async_waiter', - 'content/public/renderer/service_provider', + 'content/public/renderer/frame_service_registry', 'extensions/common/mojo/stash.mojom', 'mojo/public/js/buffer', 'mojo/public/js/codec', |