Index: chrome/browser/extensions/api/cast_channel/cast_socket.h |
=================================================================== |
--- chrome/browser/extensions/api/cast_channel/cast_socket.h (revision 250590) |
+++ chrome/browser/extensions/api/cast_channel/cast_socket.h (working copy) |
@@ -16,7 +16,6 @@ |
#include "base/threading/thread_checker.h" |
#include "chrome/browser/extensions/api/api_resource.h" |
#include "chrome/browser/extensions/api/api_resource_manager.h" |
-#include "chrome/browser/extensions/api/cast_channel/cast_channel.pb.h" |
Wez
2014/02/12 21:13:16
How did this make the build flaky? Something inclu
mark a. foltz
2014/02/12 21:45:02
The files generated from the IDL included the .pb.
Munjal (Google)
2014/02/12 22:34:36
It is complicated and hence took me a while to fig
|
#include "chrome/common/extensions/api/cast_channel.h" |
#include "net/base/completion_callback.h" |
#include "net/base/io_buffer.h" |
@@ -37,6 +36,8 @@ |
namespace api { |
namespace cast_channel { |
+class CastMessage; |
+ |
// Size (in bytes) of the largest allowed message payload on the wire (without |
// the header). |
extern const uint32 kMaxMessageSize; |
@@ -261,6 +262,8 @@ |
// The URL of the peer (cast:// or casts://). |
GURL url_; |
+ // String used in log messages for url. |
Wez
2014/02/12 21:13:16
Suggest renaming this to |log_prefix_| - you could
Munjal (Google)
2014/02/12 22:34:36
Done.
Munjal (Google)
2014/02/12 22:34:36
Done.
|
+ std::string url_log_str_; |
// Delegate to inform of incoming messages and errors. |
Delegate* delegate_; |
// True if receiver authentication should be performed. |
@@ -277,7 +280,7 @@ |
// The number of bytes in the current message body. |
uint32 current_message_size_; |
// Last message received on the socket. |
- CastMessage current_message_; |
+ scoped_ptr<CastMessage> current_message_; |
// The NetLog for this service. |
net::NetLog* net_log_; |