diff options
| -rw-r--r-- | content/child/socket_stream_dispatcher.cc | 2 | ||||
| -rw-r--r-- | webkit/child/websocketstreamhandle_bridge.h (renamed from webkit/glue/websocketstreamhandle_bridge.h) | 6 | ||||
| -rw-r--r-- | webkit/child/websocketstreamhandle_impl.cc | 5 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/content/child/socket_stream_dispatcher.cc b/content/child/socket_stream_dispatcher.cc index 9997f35..87f299f 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_bridge.h" #include "webkit/child/websocketstreamhandle_delegate.h" -#include "webkit/glue/websocketstreamhandle_bridge.h" namespace content { diff --git a/webkit/glue/websocketstreamhandle_bridge.h b/webkit/child/websocketstreamhandle_bridge.h index c1712cb..0de4265 100644 --- a/webkit/glue/websocketstreamhandle_bridge.h +++ b/webkit/child/websocketstreamhandle_bridge.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_WEBSOCKETSTREAMHANDLE_BRIDGE_H_ -#define WEBKIT_GLUE_WEBSOCKETSTREAMHANDLE_BRIDGE_H_ +#ifndef WEBKIT_CHILD_WEBSOCKETSTREAMHANDLE_BRIDGE_H_ +#define WEBKIT_CHILD_WEBSOCKETSTREAMHANDLE_BRIDGE_H_ #include <vector> @@ -40,4 +40,4 @@ class WebSocketStreamHandleBridge } // namespace webkit_glue -#endif // WEBKIT_GLUE_WEBSOCKETSTREAMHANDLE_BRIDGE_H_ +#endif // WEBKIT_CHILD_WEBSOCKETSTREAMHANDLE_BRIDGE_H_ diff --git a/webkit/child/websocketstreamhandle_impl.cc b/webkit/child/websocketstreamhandle_impl.cc index f7da0e2..fe46b8f 100644 --- a/webkit/child/websocketstreamhandle_impl.cc +++ b/webkit/child/websocketstreamhandle_impl.cc @@ -18,8 +18,8 @@ #include "third_party/WebKit/public/platform/WebSocketStreamHandleClient.h" #include "third_party/WebKit/public/platform/WebURL.h" #include "webkit/child/webkitplatformsupport_impl.h" +#include "webkit/child/websocketstreamhandle_bridge.h" #include "webkit/child/websocketstreamhandle_delegate.h" -#include "webkit/glue/websocketstreamhandle_bridge.h" using WebKit::WebData; using WebKit::WebSocketStreamError; @@ -78,8 +78,7 @@ class WebSocketStreamHandleImpl::Context WebSocketStreamHandleImpl::Context::Context(WebSocketStreamHandleImpl* handle) : handle_(handle), - client_(NULL), - bridge_(NULL) { + client_(NULL) { } void WebSocketStreamHandleImpl::Context::Connect( diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 2c88b76..5867fa2 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -64,6 +64,7 @@ '../child/webkitplatformsupport_child_impl.h', '../child/webkitplatformsupport_impl.cc', '../child/webkitplatformsupport_impl.h', + '../child/websocketstreamhandle_bridge.h', '../child/websocketstreamhandle_delegate.h', '../child/websocketstreamhandle_impl.cc', '../child/websocketstreamhandle_impl.h', @@ -162,7 +163,6 @@ 'webkit_glue.cc', 'webkit_glue.h', 'webkit_glue_export.h', - 'websocketstreamhandle_bridge.h', ], # When glue is a dependency, it needs to be a hard dependency. # Dependents may rely on files generated by this target or one of its |