Chromium Code Reviews| Index: extensions/browser/api/cast_channel/cast_channel_api.cc |
| diff --git a/extensions/browser/api/cast_channel/cast_channel_api.cc b/extensions/browser/api/cast_channel/cast_channel_api.cc |
| index 08e05d42746ccba4fd355d754855ad717e5c3471..cf33e49d239c0bb225f90e84b59e569278ab845d 100644 |
| --- a/extensions/browser/api/cast_channel/cast_channel_api.cc |
| +++ b/extensions/browser/api/cast_channel/cast_channel_api.cc |
| @@ -37,6 +37,7 @@ namespace OnError = cast_channel::OnError; |
| namespace OnMessage = cast_channel::OnMessage; |
| namespace Open = cast_channel::Open; |
| namespace Send = cast_channel::Send; |
| +using cast_channel::CastDeviceCapability; |
| using cast_channel::CastMessage; |
| using cast_channel::CastSocket; |
| using cast_channel::ChannelAuthType; |
| @@ -347,7 +348,9 @@ void CastChannelOpenFunction::AsyncWorkStart() { |
| base::TimeDelta::FromMilliseconds(connect_info_->timeout.get() |
| ? *connect_info_->timeout |
| : kDefaultConnectTimeoutMillis), |
| - api_->GetLogger()); |
| + api_->GetLogger(), |
| + connect_info_->capabilities.get() ? *connect_info_->capabilities |
|
Kevin M
2015/01/14 00:26:16
No need for get()
vadimgo
2015/01/14 01:16:14
Done.
|
| + : CastDeviceCapability::NONE); |
| } |
| new_channel_id_ = AddSocket(socket); |
| scoped_ptr<CastMessageHandler> delegate(new CastMessageHandler(api_, socket)); |