| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "net/spdy/spdy_session.h" | 5 #include "net/spdy/spdy_session.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <map> | 8 #include <map> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 bool fin, | 103 bool fin, |
| 104 SpdyStreamId stream_id, | 104 SpdyStreamId stream_id, |
| 105 NetLog::LogLevel /* log_level */) { | 105 NetLog::LogLevel /* log_level */) { |
| 106 base::DictionaryValue* dict = new base::DictionaryValue(); | 106 base::DictionaryValue* dict = new base::DictionaryValue(); |
| 107 dict->Set("headers", SpdyHeaderBlockToListValue(*headers).release()); | 107 dict->Set("headers", SpdyHeaderBlockToListValue(*headers).release()); |
| 108 dict->SetBoolean("fin", fin); | 108 dict->SetBoolean("fin", fin); |
| 109 dict->SetInteger("stream_id", stream_id); | 109 dict->SetInteger("stream_id", stream_id); |
| 110 return dict; | 110 return dict; |
| 111 } | 111 } |
| 112 | 112 |
| 113 base::Value* NetLogSpdyCredentialCallback(size_t slot, | |
| 114 const std::string* origin, | |
| 115 NetLog::LogLevel /* log_level */) { | |
| 116 base::DictionaryValue* dict = new base::DictionaryValue(); | |
| 117 dict->SetInteger("slot", slot); | |
| 118 dict->SetString("origin", *origin); | |
| 119 return dict; | |
| 120 } | |
| 121 | |
| 122 base::Value* NetLogSpdySessionCloseCallback(int net_error, | 113 base::Value* NetLogSpdySessionCloseCallback(int net_error, |
| 123 const std::string* description, | 114 const std::string* description, |
| 124 NetLog::LogLevel /* log_level */) { | 115 NetLog::LogLevel /* log_level */) { |
| 125 base::DictionaryValue* dict = new base::DictionaryValue(); | 116 base::DictionaryValue* dict = new base::DictionaryValue(); |
| 126 dict->SetInteger("net_error", net_error); | 117 dict->SetInteger("net_error", net_error); |
| 127 dict->SetString("description", *description); | 118 dict->SetString("description", *description); |
| 128 return dict; | 119 return dict; |
| 129 } | 120 } |
| 130 | 121 |
| 131 base::Value* NetLogSpdySessionCallback(const HostPortProxyPair* host_pair, | 122 base::Value* NetLogSpdySessionCallback(const HostPortProxyPair* host_pair, |
| (...skipping 2783 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2915 if (!queue->empty()) { | 2906 if (!queue->empty()) { |
| 2916 SpdyStreamId stream_id = queue->front(); | 2907 SpdyStreamId stream_id = queue->front(); |
| 2917 queue->pop_front(); | 2908 queue->pop_front(); |
| 2918 return stream_id; | 2909 return stream_id; |
| 2919 } | 2910 } |
| 2920 } | 2911 } |
| 2921 return 0; | 2912 return 0; |
| 2922 } | 2913 } |
| 2923 | 2914 |
| 2924 } // namespace net | 2915 } // namespace net |
| OLD | NEW |