diff options
| author | mfoltz <mfoltz@chromium.org> | 2015-12-11 20:43:08 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-12 04:43:55 +0000 |
| commit | d0c3de1a60bd68b88ca020f2a04f249a945f2cc8 (patch) | |
| tree | 26150b012d89e56dc6d3cfd898f631b63ce2b1e1 /extensions/renderer | |
| parent | a4703d62df53c18ada26dd7a4ab1af8a80039dd7 (diff) | |
| download | chromium_src-d0c3de1a60bd68b88ca020f2a04f249a945f2cc8.zip chromium_src-d0c3de1a60bd68b88ca020f2a04f249a945f2cc8.tar.gz chromium_src-d0c3de1a60bd68b88ca020f2a04f249a945f2cc8.tar.bz2 | |
+isherman for histograms.xml
+jdufault for chrome/browser/ui/ash
Renames CloseRoute() to Terminate() and creates DetachRoute().
This clarifies the role of the two methods invoked on PresentationConnection by plumbing the renaming through the various layers.
PresentationConnection.close() -> CloseConnection (PresentationService) -> DetachRoute (MediaRouter)
PresentationConnection.terminate() -> Terminate -> TerminateRoute
It also removes the mapping for closed and terminated presentations from the PresentationFrame to prevent duplicate invocations of DetachRoute.
BUG=540803
Review URL: https://codereview.chromium.org/1507743005
Cr-Commit-Position: refs/heads/master@{#364908}
Diffstat (limited to 'extensions/renderer')
| -rw-r--r-- | extensions/renderer/resources/media_router_bindings.js | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/extensions/renderer/resources/media_router_bindings.js b/extensions/renderer/resources/media_router_bindings.js index 7bf09d3..462fd2f 100644 --- a/extensions/renderer/resources/media_router_bindings.js +++ b/extensions/renderer/resources/media_router_bindings.js @@ -326,7 +326,7 @@ define('media_router_bindings', [ /** * @type {function(string)} */ - this.closeRoute = null; + this.terminateRoute = null; /** * @type {function(string)} @@ -362,7 +362,7 @@ define('media_router_bindings', [ /** * @type {function(string)} */ - this.onPresentationSessionDetached = null; + this.detachRoute = null; /** * @type {function()} @@ -414,8 +414,8 @@ define('media_router_bindings', [ 'sendRouteBinaryMessage', 'listenForRouteMessages', 'stopListeningForRouteMessages', - 'onPresentationSessionDetached', - 'closeRoute', + 'detachRoute', + 'terminateRoute', 'joinRoute', 'createRoute', 'stopObservingMediaSinks', @@ -498,11 +498,11 @@ define('media_router_bindings', [ }; /** - * Closes the route specified by |routeId|. + * Terminates the route specified by |routeId|. * @param {!string} routeId */ - MediaRouteProvider.prototype.closeRoute = function(routeId) { - this.handlers_.closeRoute(routeId); + MediaRouteProvider.prototype.terminateRoute = function(routeId) { + this.handlers_.terminateRoute(routeId); }; /** @@ -566,13 +566,13 @@ define('media_router_bindings', [ }; /** - * Indicates that the presentation session that was connected to |routeId| is - * no longer connected to it. + * Indicates that the presentation connection that was connected to |routeId| + * is no longer connected to it. * @param {!string} routeId */ - MediaRouteProvider.prototype.onPresentationSessionDetached = function( + MediaRouteProvider.prototype.detachRoute = function( routeId) { - this.handlers_.onPresentationSessionDetached(routeId); + this.handlers_.detachRoute(routeId); }; /** |