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

Side by Side Diff: chrome/browser/renderer_host/socket_stream_host.cc

Issue 6474012: Create a path to deliver SocketStream errors to the renderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add unit test and test_shell code Created 9 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/renderer_host/socket_stream_host.h" 5 #include "chrome/browser/renderer_host/socket_stream_host.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/common/net/socket_stream.h" 8 #include "chrome/common/net/socket_stream.h"
9 #include "net/socket_stream/socket_stream_job.h" 9 #include "net/socket_stream/socket_stream_job.h"
10 10
(...skipping 12 matching lines...) Expand all
23 SocketStreamHost::SocketStreamHost( 23 SocketStreamHost::SocketStreamHost(
24 net::SocketStream::Delegate* delegate, 24 net::SocketStream::Delegate* delegate,
25 int socket_id) 25 int socket_id)
26 : delegate_(delegate), 26 : delegate_(delegate),
27 socket_id_(socket_id) { 27 socket_id_(socket_id) {
28 DCHECK_NE(socket_id_, chrome_common_net::kNoSocketId); 28 DCHECK_NE(socket_id_, chrome_common_net::kNoSocketId);
29 VLOG(1) << "SocketStreamHost: socket_id=" << socket_id_; 29 VLOG(1) << "SocketStreamHost: socket_id=" << socket_id_;
30 } 30 }
31 31
32 /* static */ 32 /* static */
33 int SocketStreamHost::SocketIdFromSocketStream(net::SocketStream* socket) { 33 int SocketStreamHost::SocketIdFromSocketStream(
34 const net::SocketStream* socket) {
34 net::SocketStream::UserData* d = socket->GetUserData(kSocketIdKey); 35 net::SocketStream::UserData* d = socket->GetUserData(kSocketIdKey);
35 if (d) { 36 if (d) {
36 SocketStreamId* socket_stream_id = static_cast<SocketStreamId*>(d); 37 SocketStreamId* socket_stream_id = static_cast<SocketStreamId*>(d);
37 return socket_stream_id->socket_id(); 38 return socket_stream_id->socket_id();
38 } 39 }
39 return chrome_common_net::kNoSocketId; 40 return chrome_common_net::kNoSocketId;
40 } 41 }
41 42
42 SocketStreamHost::~SocketStreamHost() { 43 SocketStreamHost::~SocketStreamHost() {
43 VLOG(1) << "SocketStreamHost destructed socket_id=" << socket_id_; 44 VLOG(1) << "SocketStreamHost destructed socket_id=" << socket_id_;
(...skipping 13 matching lines...) Expand all
57 VLOG(1) << "SocketStreamHost::SendData"; 58 VLOG(1) << "SocketStreamHost::SendData";
58 return socket_ && socket_->SendData(&data[0], data.size()); 59 return socket_ && socket_->SendData(&data[0], data.size());
59 } 60 }
60 61
61 void SocketStreamHost::Close() { 62 void SocketStreamHost::Close() {
62 VLOG(1) << "SocketStreamHost::Close"; 63 VLOG(1) << "SocketStreamHost::Close";
63 if (!socket_) 64 if (!socket_)
64 return; 65 return;
65 socket_->Close(); 66 socket_->Close();
66 } 67 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698