diff options
| author | imcheng <imcheng@chromium.org> | 2016-02-24 19:21:17 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-25 03:22:23 +0000 |
| commit | c9e4189c7f733ce0d4984f7295d7359a3fb894b4 (patch) | |
| tree | fe0ee8c2369e28f2985b23e0e171bea25ade5cf2 | |
| parent | 1462a929e00255654a06d3e905adc72ba1255ad5 (diff) | |
| download | chromium_src-c9e4189c7f733ce0d4984f7295d7359a3fb894b4.zip chromium_src-c9e4189c7f733ce0d4984f7295d7359a3fb894b4.tar.gz chromium_src-c9e4189c7f733ce0d4984f7295d7359a3fb894b4.tar.bz2 | |
[Media Router] Fix JS error in media_router_bindings.js.
Also fix flipped if condition in presentation_dispatcher.cc.
error was introduced in previous patch in crrev.com/1701143002.
BUG=579360,574233,574234
Review URL: https://codereview.chromium.org/1731153003
Cr-Commit-Position: refs/heads/master@{#377485}
| -rw-r--r-- | content/renderer/presentation/presentation_dispatcher.cc | 2 | ||||
| -rw-r--r-- | extensions/renderer/resources/media_router_bindings.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/content/renderer/presentation/presentation_dispatcher.cc b/content/renderer/presentation/presentation_dispatcher.cc index c79b6e3..df8f970 100644 --- a/content/renderer/presentation/presentation_dispatcher.cc +++ b/content/renderer/presentation/presentation_dispatcher.cc @@ -402,7 +402,7 @@ void PresentationDispatcher::OnConnectionClosed( presentation::PresentationSessionInfoPtr connection, presentation::PresentationConnectionCloseReason reason, const mojo::String& message) { - if (controller_) + if (!controller_) return; DCHECK(!connection.is_null()); diff --git a/extensions/renderer/resources/media_router_bindings.js b/extensions/renderer/resources/media_router_bindings.js index 0b0bee0..ebb668c 100644 --- a/extensions/renderer/resources/media_router_bindings.js +++ b/extensions/renderer/resources/media_router_bindings.js @@ -130,7 +130,7 @@ define('media_router_bindings', [ function presentationConnectionCloseReasonToMojo_(reason) { var PresentationConnectionCloseReason = mediaRouterMojom.MediaRouter.PresentationConnectionCloseReason; - switch (state) { + switch (reason) { case 'error': return PresentationConnectionCloseReason.CONNECTION_ERROR; case 'closed': @@ -392,7 +392,7 @@ define('media_router_bindings', [ MediaRouter.prototype.onPresentationConnectionClosed = function(routeId, reason, message) { this.service_.onPresentationConnectionClosed( - routeId, presentationConnectionCloseReasonToMojo_(state), message); + routeId, presentationConnectionCloseReasonToMojo_(reason), message); }; /** |