summaryrefslogtreecommitdiffstats
path: root/content/child/socket_stream_dispatcher.cc
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-23 02:45:43 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-23 02:45:43 +0000
commitd0fcff7b79fdc1b1931eb0e2e2da20ae8771ad57 (patch)
tree9fae17aca3536ca96737741724b782c189bd4e23 /content/child/socket_stream_dispatcher.cc
parent770c714e651efbeef3507a3c177c619867c4f346 (diff)
downloadchromium_src-d0fcff7b79fdc1b1931eb0e2e2da20ae8771ad57.zip
chromium_src-d0fcff7b79fdc1b1931eb0e2e2da20ae8771ad57.tar.gz
chromium_src-d0fcff7b79fdc1b1931eb0e2e2da20ae8771ad57.tar.bz2
reland crrev.com/212927 Move webkitplatformsupport_impl and related from glue to child
Win x64 warning suppression, and allocator dependency on linux for shared_library build compared to previous land. TBR=jam@chromium.org Review URL: https://codereview.chromium.org/20003004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213033 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/child/socket_stream_dispatcher.cc')
-rw-r--r--content/child/socket_stream_dispatcher.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/child/socket_stream_dispatcher.cc b/content/child/socket_stream_dispatcher.cc
index 8dc4569..9997f35 100644
--- a/content/child/socket_stream_dispatcher.cc
+++ b/content/child/socket_stream_dispatcher.cc
@@ -19,8 +19,8 @@
#include "content/common/socket_stream_messages.h"
#include "net/base/net_errors.h"
#include "url/gurl.h"
+#include "webkit/child/websocketstreamhandle_delegate.h"
#include "webkit/glue/websocketstreamhandle_bridge.h"
-#include "webkit/glue/websocketstreamhandle_delegate.h"
namespace content {