diff options
| author | imcheng <imcheng@chromium.org> | 2015-12-04 16:41:29 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-05 00:42:13 +0000 |
| commit | a743f7f9316a2336257b6daf0570e4c2b2a982e6 (patch) | |
| tree | 5a35ee471c5b8cdb85329ee5fd1148e6ac9f7f10 /extensions/renderer | |
| parent | 931533d38f6b44a56f7a768e91d71f2f167c7897 (diff) | |
| download | chromium_src-a743f7f9316a2336257b6daf0570e4c2b2a982e6.zip chromium_src-a743f7f9316a2336257b6daf0570e4c2b2a982e6.tar.gz chromium_src-a743f7f9316a2336257b6daf0570e4c2b2a982e6.tar.bz2 | |
[MR] Add description field to MediaSink.
description is an optional field on MediaSink which can be used for
displaying information on the sink itself in the UI.
The sink description will be displayed as a subtext under the sink
name. If the sink is currently associated with a route, then the route
description is displayed in the subtext instead.
Applied conditional stamping to the subtext in media-router-container.
Currently, most sinks will not have subtexts in typical usage.
BUG=545138
Review URL: https://codereview.chromium.org/1475843002
Cr-Commit-Position: refs/heads/master@{#363314}
Diffstat (limited to 'extensions/renderer')
| -rw-r--r-- | extensions/renderer/resources/media_router_bindings.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/extensions/renderer/resources/media_router_bindings.js b/extensions/renderer/resources/media_router_bindings.js index 6bc357d86..7bf09d3 100644 --- a/extensions/renderer/resources/media_router_bindings.js +++ b/extensions/renderer/resources/media_router_bindings.js @@ -29,6 +29,7 @@ define('media_router_bindings', [ function sinkToMojo_(sink) { return new mediaRouterMojom.MediaSink({ 'name': sink.friendlyName, + 'description': sink.description, 'sink_id': sink.id, 'icon_type': sinkIconTypeToMojo(sink.iconType), }); |