Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Unified Diff: extensions/browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc

Issue 820673004: json_schema_compiler: Use std::vector<char> for binary values. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@simplify_json_schema
Patch Set: Fix merge error. Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc
diff --git a/extensions/browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc b/extensions/browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc
index 1f619a111240efecfb148a58a42f0087ca22c874..0d52ae5937d2f13e0d0c15bd79a608b540819067 100644
--- a/extensions/browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc
+++ b/extensions/browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc
@@ -128,7 +128,7 @@ void TCPSocketEventDispatcher::ReadCallback(
// Dispatch "onReceive" event.
sockets_tcp::ReceiveInfo receive_info;
receive_info.socket_id = params.socket_id;
- receive_info.data = std::string(io_buffer->data(), bytes_read);
+ receive_info.data.assign(io_buffer->data(), io_buffer->data() + bytes_read);
scoped_ptr<base::ListValue> args =
sockets_tcp::OnReceive::Create(receive_info);
scoped_ptr<Event> event(

Powered by Google App Engine
This is Rietveld 408576698