summaryrefslogtreecommitdiffstats
path: root/net/websockets
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-08 18:06:44 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-08 18:06:44 +0000
commit78994ab0a043ead9b3edb4a48c7f13cc6c2aede6 (patch)
tree357ae4e0cf8bf140e616d3086b29472043aaf0e5 /net/websockets
parenta7a265efd24072f9dc7b5f737ec84d5ae0553cd6 (diff)
downloadchromium_src-78994ab0a043ead9b3edb4a48c7f13cc6c2aede6.zip
chromium_src-78994ab0a043ead9b3edb4a48c7f13cc6c2aede6.tar.gz
chromium_src-78994ab0a043ead9b3edb4a48c7f13cc6c2aede6.tar.bz2
Add the "virtual" keyword on method overrides that are missing it.
BUG=none TEST=compiles Review URL: http://codereview.chromium.org/5648004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68606 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
-rw-r--r--net/websockets/websocket_net_log_params.cc51
-rw-r--r--net/websockets/websocket_net_log_params.h41
2 files changed, 54 insertions, 38 deletions
diff --git a/net/websockets/websocket_net_log_params.cc b/net/websockets/websocket_net_log_params.cc
new file mode 100644
index 0000000..53b46c8
--- /dev/null
+++ b/net/websockets/websocket_net_log_params.cc
@@ -0,0 +1,51 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "net/websockets/websocket_net_log_params.h"
+
+namespace net {
+
+NetLogWebSocketHandshakeParameter::NetLogWebSocketHandshakeParameter(
+ const std::string& headers)
+ : headers_(headers) {
+}
+
+Value* NetLogWebSocketHandshakeParameter::ToValue() const {
+ DictionaryValue* dict = new DictionaryValue();
+ ListValue* headers = new ListValue();
+
+ size_t last = 0;
+ size_t headers_size = headers_.size();
+ size_t pos = 0;
+ while (pos <= headers_size) {
+ if (pos == headers_size ||
+ (headers_[pos] == '\r' &&
+ pos + 1 < headers_size && headers_[pos + 1] == '\n')) {
+ std::string entry = headers_.substr(last, pos - last);
+ pos += 2;
+ last = pos;
+
+ headers->Append(new StringValue(entry));
+
+ if (entry.empty()) {
+ // Dump WebSocket key3.
+ std::string key;
+ for (; pos < headers_size; ++pos) {
+ key += base::StringPrintf("\\x%02x", headers_[pos] & 0xff);
+ }
+ headers->Append(new StringValue(key));
+ break;
+ }
+ } else {
+ ++pos;
+ }
+ }
+
+ dict->Set("headers", headers);
+ return dict;
+}
+
+NetLogWebSocketHandshakeParameter::~NetLogWebSocketHandshakeParameter() {}
+
+} // namespace net
diff --git a/net/websockets/websocket_net_log_params.h b/net/websockets/websocket_net_log_params.h
index 4cd058f..1da234c 100644
--- a/net/websockets/websocket_net_log_params.h
+++ b/net/websockets/websocket_net_log_params.h
@@ -21,47 +21,12 @@ namespace net {
class NetLogWebSocketHandshakeParameter : public NetLog::EventParameters {
public:
- explicit NetLogWebSocketHandshakeParameter(const std::string& headers)
- : headers_(headers) {
- }
+ explicit NetLogWebSocketHandshakeParameter(const std::string& headers);
- Value* ToValue() const {
- DictionaryValue* dict = new DictionaryValue();
- ListValue* headers = new ListValue();
-
- size_t last = 0;
- size_t headers_size = headers_.size();
- size_t pos = 0;
- while (pos <= headers_size) {
- if (pos == headers_size ||
- (headers_[pos] == '\r' &&
- pos + 1 < headers_size && headers_[pos + 1] == '\n')) {
- std::string entry = headers_.substr(last, pos - last);
- pos += 2;
- last = pos;
-
- headers->Append(new StringValue(entry));
-
- if (entry.empty()) {
- // Dump WebSocket key3.
- std::string key;
- for (; pos < headers_size; ++pos) {
- key += base::StringPrintf("\\x%02x", headers_[pos] & 0xff);
- }
- headers->Append(new StringValue(key));
- break;
- }
- } else {
- ++pos;
- }
- }
-
- dict->Set("headers", headers);
- return dict;
- }
+ virtual Value* ToValue() const;
private:
- ~NetLogWebSocketHandshakeParameter() {}
+ virtual ~NetLogWebSocketHandshakeParameter();
const std::string headers_;