diff options
| author | apacible <apacible@chromium.org> | 2015-10-06 09:25:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-06 16:26:11 +0000 |
| commit | 05ed82a4c0bd71cd6ea3f39d922eb4a45bb39075 (patch) | |
| tree | cc3dac6b5afa313a18dd13a49b32d1bdabb8ae55 /extensions/renderer/resources | |
| parent | a8cbd8a30159fb441a983e4409d6269eaed12404 (diff) | |
| download | chromium_src-05ed82a4c0bd71cd6ea3f39d922eb4a45bb39075.zip chromium_src-05ed82a4c0bd71cd6ea3f39d922eb4a45bb39075.tar.gz chromium_src-05ed82a4c0bd71cd6ea3f39d922eb4a45bb39075.tar.bz2 | |
[Media Router] Set timeout for route creation.
This sets a timeout in case of a route creation request that doesn't get a response from the provider.
We determined the timeout time, 20s, based on a couple of factors. The default cast timeout is 10s, but there is a way for third party apps to override the timeout, usually using 12s instead. This change also makes the WebUI handle a timeout on route creation.
This change also removes is_launching from the MediaSink. We determine which Sink is currently being launched by tracking the ID of the Sink that was clicked in the WebUI.
BUG=490372
Review URL: https://codereview.chromium.org/1363593003
Cr-Commit-Position: refs/heads/master@{#352615}
Diffstat (limited to 'extensions/renderer/resources')
| -rw-r--r-- | extensions/renderer/resources/media_router_bindings.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/extensions/renderer/resources/media_router_bindings.js b/extensions/renderer/resources/media_router_bindings.js index 172b91b..90cf50d 100644 --- a/extensions/renderer/resources/media_router_bindings.js +++ b/extensions/renderer/resources/media_router_bindings.js @@ -31,7 +31,6 @@ define('media_router_bindings', [ 'name': sink.friendlyName, 'sink_id': sink.id, 'icon_type': sinkIconTypeToMojo(sink.iconType), - 'is_launching': sink.isLaunching_, }); } |