summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-22 22:18:12 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-22 22:18:12 +0000
commitea91957f093ff2af923cd6f9247deae30dbaf6d9 (patch)
treecd784a67015ff29222127dc2637ecaef271834f9
parentefac0b1fd0c64df92be06cb909e6bfbc835cfe3a (diff)
downloadchromium_src-ea91957f093ff2af923cd6f9247deae30dbaf6d9.zip
chromium_src-ea91957f093ff2af923cd6f9247deae30dbaf6d9.tar.gz
chromium_src-ea91957f093ff2af923cd6f9247deae30dbaf6d9.tar.bz2
Rename chrome.webrtc.udpTransport to chrome.webrtc.castUdpTransport
Renaming chrome.webrtc.udpTransport to be cast speceific. BUG=301920 Review URL: https://codereview.chromium.org/29153005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230228 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/common/extensions/api/_api_features.json2
-rw-r--r--chrome/common/extensions/api/api.gyp2
-rw-r--r--chrome/common/extensions/api/webrtc_cast_udp_transport.idl (renamed from chrome/common/extensions/api/webrtc_udp_transport.idl)11
-rw-r--r--chrome/renderer/extensions/dispatcher.cc4
-rw-r--r--chrome/renderer/resources/extensions/webrtc_cast_udp_transport_custom_bindings.js (renamed from chrome/renderer/resources/extensions/webrtc_udp_transport_custom_bindings.js)2
-rw-r--r--chrome/renderer/resources/renderer_resources.grd2
6 files changed, 12 insertions, 11 deletions
diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/extensions/api/_api_features.json
index e9317da..1c518d93 100644
--- a/chrome/common/extensions/api/_api_features.json
+++ b/chrome/common/extensions/api/_api_features.json
@@ -698,7 +698,7 @@
"dependencies": ["permission:webrtc"],
"contexts": ["blessed_extension"]
},
- "webrtc.udpTransport": {
+ "webrtc.castUdpTransport": {
"dependencies": ["permission:webrtc"],
"contexts": ["blessed_extension"]
},
diff --git a/chrome/common/extensions/api/api.gyp b/chrome/common/extensions/api/api.gyp
index 3c90b0d..7d143d8 100644
--- a/chrome/common/extensions/api/api.gyp
+++ b/chrome/common/extensions/api/api.gyp
@@ -154,8 +154,8 @@
['enable_webrtc==1', {
'schema_files': [
'webrtc_cast_send_transport.idl',
+ 'webrtc_cast_udp_transport.idl',
'webrtc_logging_private.idl',
- 'webrtc_udp_transport.idl',
],
}],
],
diff --git a/chrome/common/extensions/api/webrtc_udp_transport.idl b/chrome/common/extensions/api/webrtc_cast_udp_transport.idl
index f118671..7135fba 100644
--- a/chrome/common/extensions/api/webrtc_udp_transport.idl
+++ b/chrome/common/extensions/api/webrtc_cast_udp_transport.idl
@@ -2,11 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// The <code>chrome.webrtc.udpTransport</code> API creates a UDP transport
-// for outer transport to send and receive data. This API is not useful when
-// standalone since it does not have send and receive methods. It should be
-// used as an inner transport for other transports such as castSendTransport.
-namespace webrtc.udpTransport {
+// The <code>chrome.webrtc.castUdpTransport</code> API creates a UDP
+// transport for outer transport to send and receive data. This API is not
+// useful when standalone since it does not have send and receive methods.
+// It should be used as an inner transport for other transports such as
+// castSendTransport.
+namespace webrtc.castUdpTransport {
// The UDP socket address and port.
dictionary UdpParams {
DOMString address;
diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc
index 6a3c090..ac0f8f5 100644
--- a/chrome/renderer/extensions/dispatcher.cc
+++ b/chrome/renderer/extensions/dispatcher.cc
@@ -965,8 +965,8 @@ void Dispatcher::PopulateSourceMap() {
IDR_WEB_REQUEST_INTERNAL_CUSTOM_BINDINGS_JS);
source_map_.RegisterSource("webrtc.castSendTransport",
IDR_WEBRTC_CAST_SEND_TRANSPORT_CUSTOM_BINDINGS_JS);
- source_map_.RegisterSource("webrtc.udpTransport",
- IDR_WEBRTC_UDP_TRANSPORT_CUSTOM_BINDINGS_JS);
+ source_map_.RegisterSource("webrtc.castUdpTransport",
+ IDR_WEBRTC_CAST_UDP_TRANSPORT_CUSTOM_BINDINGS_JS);
source_map_.RegisterSource("webstore", IDR_WEBSTORE_CUSTOM_BINDINGS_JS);
source_map_.RegisterSource("windowControls", IDR_WINDOW_CONTROLS_JS);
source_map_.RegisterSource("binding", IDR_BINDING_JS);
diff --git a/chrome/renderer/resources/extensions/webrtc_udp_transport_custom_bindings.js b/chrome/renderer/resources/extensions/webrtc_cast_udp_transport_custom_bindings.js
index 3b0b42f..d1dceb5 100644
--- a/chrome/renderer/resources/extensions/webrtc_udp_transport_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/webrtc_cast_udp_transport_custom_bindings.js
@@ -4,7 +4,7 @@
// Custom binding for the webrtc custom transport API.
-var binding = require('binding').Binding.create('webrtc.udpTransport');
+var binding = require('binding').Binding.create('webrtc.castUdpTransport');
binding.registerCustomHook(function(bindingsAPI, extensionId) {
var apiFunctions = bindingsAPI.apiFunctions;
diff --git a/chrome/renderer/resources/renderer_resources.grd b/chrome/renderer/resources/renderer_resources.grd
index 60ef63f..d199fd0 100644
--- a/chrome/renderer/resources/renderer_resources.grd
+++ b/chrome/renderer/resources/renderer_resources.grd
@@ -91,7 +91,7 @@ without changes to the corresponding grd file. fb9 -->
<include name="IDR_WEB_REQUEST_CUSTOM_BINDINGS_JS" file="extensions\web_request_custom_bindings.js" type="BINDATA" />
<include name="IDR_WEB_REQUEST_INTERNAL_CUSTOM_BINDINGS_JS" file="extensions\web_request_internal_custom_bindings.js" type="BINDATA" />
<include name="IDR_WEBRTC_CAST_SEND_TRANSPORT_CUSTOM_BINDINGS_JS" file="extensions\webrtc_cast_send_transport_custom_bindings.js" type="BINDATA" />
- <include name="IDR_WEBRTC_UDP_TRANSPORT_CUSTOM_BINDINGS_JS" file="extensions\webrtc_udp_transport_custom_bindings.js" type="BINDATA" />
+ <include name="IDR_WEBRTC_CAST_UDP_TRANSPORT_CUSTOM_BINDINGS_JS" file="extensions\webrtc_cast_udp_transport_custom_bindings.js" type="BINDATA" />
<include name="IDR_WEBSTORE_CUSTOM_BINDINGS_JS" file="extensions\webstore_custom_bindings.js" type="BINDATA" />
<include name="IDR_WEB_VIEW_DENY_JS" file="extensions\web_view_deny.js" type="BINDATA" />
<include name="IDR_WEB_VIEW_EXPERIMENTAL_JS" file="extensions\web_view_experimental.js" type="BINDATA" />