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 c2c083c79cfe234a4040486b111dbcf7f4e0963c..b40b2f8f603e2d155e1675e64920e2e8a97ae56c 100644 |
--- a/extensions/browser/api/cast_channel/cast_channel_api.cc |
+++ b/extensions/browser/api/cast_channel/cast_channel_api.cc |
@@ -173,7 +173,8 @@ void CastChannelAPI::OnMessage(const CastSocket* socket, |
CastChannelAPI::~CastChannelAPI() {} |
CastChannelAsyncApiFunction::CastChannelAsyncApiFunction() |
- : manager_(NULL), error_(cast_channel::CHANNEL_ERROR_NONE) { } |
+ : manager_(NULL), is_channel_error_(false) { |
+} |
CastChannelAsyncApiFunction::~CastChannelAsyncApiFunction() { } |
@@ -183,7 +184,7 @@ bool CastChannelAsyncApiFunction::PrePrepare() { |
} |
bool CastChannelAsyncApiFunction::Respond() { |
- return error_ == cast_channel::CHANNEL_ERROR_NONE; |
+ return !is_channel_error_ && GetError().empty(); |
} |
CastSocket* CastChannelAsyncApiFunction::GetSocketOrCompleteWithError( |
@@ -231,7 +232,7 @@ void CastChannelAsyncApiFunction::SetResultFromError(int channel_id, |
channel_info.connect_info.port = 0; |
channel_info.connect_info.auth = cast_channel::CHANNEL_AUTH_TYPE_SSL; |
SetResultFromChannelInfo(channel_info); |
- error_ = error; |
+ is_channel_error_ = true; |
mark a. foltz
2014/11/01 19:29:39
It might be a good idea to set an error message si
vadimgo
2014/11/03 21:22:45
Done. Also uncovered an issue with my changes in S
|
} |
CastSocket* CastChannelAsyncApiFunction::GetSocket(int channel_id) { |