summaryrefslogtreecommitdiffstats
path: root/net/net.gyp
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-21 07:59:36 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-21 07:59:36 +0000
commit6d9fc74850f406940ddfa05921677ecc62d76e0d (patch)
tree0b385d0b3a08a91fa77f81bf20a2fdd7cf5c2e47 /net/net.gyp
parent2c7b4d74870fe18ea04dcb281e43c4982c57f414 (diff)
downloadchromium_src-6d9fc74850f406940ddfa05921677ecc62d76e0d.zip
chromium_src-6d9fc74850f406940ddfa05921677ecc62d76e0d.tar.gz
chromium_src-6d9fc74850f406940ddfa05921677ecc62d76e0d.tar.bz2
WebSocket protocol handler for live experiment (again)
This is in-browser-process WebSocket protocol handler, which will be used inWebSocket live experiment. Change WebSocket::Delegate to WebSocketDelegate to avoid compile error on MSVC. BUG=none TEST=net_unittests passes Review URL: http://codereview.chromium.org/300035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
-rw-r--r--net/net.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp
index 00c5661..f672009 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -384,6 +384,8 @@
'url_request/url_request_view_net_internals_job.h',
'url_request/view_cache_helper.cc',
'url_request/view_cache_helper.h',
+ 'websockets/websocket.cc',
+ 'websockets/websocket.h',
],
'export_dependent_settings': [
'../base/base.gyp:base',
@@ -553,6 +555,7 @@
'socket/tcp_pinger_unittest.cc',
'url_request/url_request_unittest.cc',
'url_request/url_request_unittest.h',
+ 'websockets/websocket_unittest.cc',
],
'conditions': [
[ 'OS == "win"', {