diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-28 21:49:31 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-08 17:55:00 +0100 |
| commit | ddb351dbec246cf1fab5ec20d2d5520909041de1 (patch) | |
| tree | 158e3fb57bdcac07c7f1e767fde3c70687c9fbb1 /net/websockets/websocket_job.h | |
| parent | 6b92e04f5f151c896e3088e86f70db7081009308 (diff) | |
| download | external_chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.zip external_chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.tar.gz external_chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.tar.bz2 | |
Merge Chromium at r12.0.742.93: Initial merge by git
Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
Diffstat (limited to 'net/websockets/websocket_job.h')
| -rw-r--r-- | net/websockets/websocket_job.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/websockets/websocket_job.h b/net/websockets/websocket_job.h index d9a6e71..1de1c1d 100644 --- a/net/websockets/websocket_job.h +++ b/net/websockets/websocket_job.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -108,9 +108,6 @@ class WebSocketJob : public SocketStreamJob, public SocketStream::Delegate { std::vector<std::string> response_cookies_; size_t response_cookies_save_index_; - CompletionCallbackImpl<WebSocketJob> can_get_cookies_callback_; - CompletionCallbackImpl<WebSocketJob> can_set_cookie_callback_; - scoped_ptr<WebSocketFrameHandler> send_frame_handler_; scoped_refptr<DrainableIOBuffer> current_buffer_; scoped_ptr<WebSocketFrameHandler> receive_frame_handler_; |