Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Unified Diff: trunk/src/webkit/glue/websocketstreamhandle_impl.cc

Issue 14335011: Revert 196728 "Websocket should fire 'error' event if no server ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/webkit/glue/websocketstreamhandle_impl.cc
===================================================================
--- trunk/src/webkit/glue/websocketstreamhandle_impl.cc (revision 196854)
+++ trunk/src/webkit/glue/websocketstreamhandle_impl.cc (working copy)
@@ -12,9 +12,7 @@
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/string16.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebSocketStreamError.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebSocketStreamHandleClient.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
#include "webkit/glue/webkitplatformsupport_impl.h"
@@ -22,7 +20,6 @@
#include "webkit/glue/websocketstreamhandle_delegate.h"
using WebKit::WebData;
-using WebKit::WebSocketStreamError;
using WebKit::WebSocketStreamHandle;
using WebKit::WebSocketStreamHandleClient;
using WebKit::WebURL;
@@ -57,7 +54,6 @@
const char*,
int) OVERRIDE;
virtual void DidClose(WebSocketStreamHandle*) OVERRIDE;
- virtual void DidFail(WebSocketStreamHandle*, int, const string16&);
private:
friend class base::RefCounted<Context>;
@@ -149,18 +145,6 @@
Release();
}
-void WebSocketStreamHandleImpl::Context::DidFail(
- WebSocketStreamHandle* web_handle,
- int error_code,
- const string16& error_msg) {
- VLOG(1) << "DidFail";
- if (client_) {
- client_->didFail(
- handle_,
- WebSocketStreamError(error_code, error_msg));
- }
-}
-
// WebSocketStreamHandleImpl ------------------------------------------------
WebSocketStreamHandleImpl::WebSocketStreamHandleImpl(

Powered by Google App Engine
This is Rietveld 408576698