OLD | NEW |
---|---|
1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/media/router/discovery/media_sink_internal.h" | 5 #include "chrome/browser/media/router/discovery/media_sink_internal.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
9 | 9 |
10 namespace media_router { | 10 namespace media_router { |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
57 return *dial_data_ == *(other.dial_data_); | 57 return *dial_data_ == *(other.dial_data_); |
58 case SinkType::CAST: | 58 case SinkType::CAST: |
59 return *cast_data_ == *(other.cast_data_); | 59 return *cast_data_ == *(other.cast_data_); |
60 case SinkType::GENERIC: | 60 case SinkType::GENERIC: |
61 return true; | 61 return true; |
62 } | 62 } |
63 NOTREACHED(); | 63 NOTREACHED(); |
64 return false; | 64 return false; |
65 } | 65 } |
66 | 66 |
67 bool MediaSinkInternal::operator!=(const MediaSinkInternal& other) const { | |
68 return !operator==(other); | |
mark a. foltz
2017/04/12 00:17:18
Nice :) I did not know this trick and would have
zhaobin
2017/04/18 06:58:28
Acknowledged.
| |
69 } | |
70 | |
67 void MediaSinkInternal::set_sink(const MediaSink& sink) { | 71 void MediaSinkInternal::set_sink(const MediaSink& sink) { |
68 sink_ = sink; | 72 sink_ = sink; |
69 } | 73 } |
70 | 74 |
71 void MediaSinkInternal::set_dial_data(const DialSinkExtraData& dial_data) { | 75 void MediaSinkInternal::set_dial_data(const DialSinkExtraData& dial_data) { |
72 DCHECK(sink_type_ != SinkType::CAST); | 76 DCHECK(sink_type_ != SinkType::CAST); |
73 InternalCleanup(); | 77 InternalCleanup(); |
74 | 78 |
75 sink_type_ = SinkType::DIAL; | 79 sink_type_ = SinkType::DIAL; |
76 dial_data_.Init(dial_data); | 80 dial_data_.Init(dial_data); |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
147 case SinkType::CAST: | 151 case SinkType::CAST: |
148 cast_data_.Destroy(); | 152 cast_data_.Destroy(); |
149 return; | 153 return; |
150 case SinkType::GENERIC: | 154 case SinkType::GENERIC: |
151 return; | 155 return; |
152 } | 156 } |
153 NOTREACHED(); | 157 NOTREACHED(); |
154 } | 158 } |
155 | 159 |
156 DialSinkExtraData::DialSinkExtraData() = default; | 160 DialSinkExtraData::DialSinkExtraData() = default; |
161 DialSinkExtraData::DialSinkExtraData(const std::string& ip_address, | |
162 const std::string& model_name, | |
163 const std::string& app_url) | |
164 : model_name(model_name), app_url(app_url) { | |
165 DCHECK(this->ip_address.AssignFromIPLiteral(ip_address)); | |
mark a. foltz
2017/04/12 00:17:18
This won't be called in release builds, and I feel
zhaobin
2017/04/18 06:58:27
Code removed.
| |
166 } | |
157 DialSinkExtraData::DialSinkExtraData(const DialSinkExtraData& other) = default; | 167 DialSinkExtraData::DialSinkExtraData(const DialSinkExtraData& other) = default; |
158 DialSinkExtraData::~DialSinkExtraData() = default; | 168 DialSinkExtraData::~DialSinkExtraData() = default; |
159 | 169 |
160 bool DialSinkExtraData::operator==(const DialSinkExtraData& other) const { | 170 bool DialSinkExtraData::operator==(const DialSinkExtraData& other) const { |
161 return ip_address == other.ip_address && model_name == other.model_name && | 171 return ip_address == other.ip_address && model_name == other.model_name && |
162 app_url == other.app_url; | 172 app_url == other.app_url; |
163 } | 173 } |
164 | 174 |
165 CastSinkExtraData::CastSinkExtraData() = default; | 175 CastSinkExtraData::CastSinkExtraData() = default; |
166 CastSinkExtraData::CastSinkExtraData(const CastSinkExtraData& other) = default; | 176 CastSinkExtraData::CastSinkExtraData(const CastSinkExtraData& other) = default; |
167 CastSinkExtraData::~CastSinkExtraData() = default; | 177 CastSinkExtraData::~CastSinkExtraData() = default; |
168 | 178 |
169 bool CastSinkExtraData::operator==(const CastSinkExtraData& other) const { | 179 bool CastSinkExtraData::operator==(const CastSinkExtraData& other) const { |
170 return ip_address == other.ip_address && model_name == other.model_name && | 180 return ip_address == other.ip_address && model_name == other.model_name && |
171 capabilities == other.capabilities && | 181 capabilities == other.capabilities && |
172 cast_channel_id == other.cast_channel_id; | 182 cast_channel_id == other.cast_channel_id; |
173 } | 183 } |
174 | 184 |
175 } // namespace media_router | 185 } // namespace media_router |
OLD | NEW |