[Media Router] Add iconType field to MediaSink.
commitebbcdbe3be13769154dd6509cfcd512c8b4c8f80
authorapacible <apacible@chromium.org>
Thu, 3 Sep 2015 22:03:04 +0000 (3 15:03 -0700)
committerCommit bot <commit-bot@chromium.org>
Thu, 3 Sep 2015 22:03:51 +0000 (3 22:03 +0000)
tree6180e11f95252b0801200d00864b090c6458442c
parentba8f4113e5f7731161d3487d1018bf7ad6428dcb
[Media Router] Add iconType field to MediaSink.

This adds the iconType field so the Media Router UI can show different icons for each Sink based on its device type. Android will not use iconType, so the Android MediaSinks will always have a "generic" iconType.

BUG=526251

Review URL: https://codereview.chromium.org/1313043004

Cr-Commit-Position: refs/heads/master@{#347257}
20 files changed:
chrome/browser/media/android/router/media_router_android.cc
chrome/browser/media/router/media_route_unittest.cc
chrome/browser/media/router/media_router.mojom
chrome/browser/media/router/media_router_mojo_impl_unittest.cc
chrome/browser/media/router/media_router_type_converters.cc
chrome/browser/media/router/media_router_type_converters.h
chrome/browser/media/router/media_router_type_converters_unittest.cc
chrome/browser/media/router/media_sink.cc
chrome/browser/media/router/media_sink.h
chrome/browser/media/router/media_sink_unittest.cc
chrome/browser/media/router/presentation_media_sinks_observer_unittest.cc
chrome/browser/media/router/presentation_session_state_observer_unittest.cc
chrome/browser/resources/media_router/media_router_data.js
chrome/browser/ui/toolbar/media_router_action_unittest.cc
chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc
chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc
chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc
chrome/test/data/webui/media_router/media_router_container_tests.js
chrome/test/data/webui/media_router/route_details_tests.js
extensions/renderer/resources/media_router_bindings.js