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

Side by Side Diff: content/browser/renderer_host/socket_stream_dispatcher_host.cc

Issue 8346017: Move content_browser_client.h to public, and while at it, move (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Missed a file post merge. Created 9 years, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/socket_stream_dispatcher_host.h" 5 #include "content/browser/renderer_host/socket_stream_dispatcher_host.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/browser/content_browser_client.h"
9 #include "content/browser/renderer_host/socket_stream_host.h" 8 #include "content/browser/renderer_host/socket_stream_host.h"
10 #include "content/common/socket_stream.h" 9 #include "content/common/socket_stream.h"
11 #include "content/common/socket_stream_messages.h" 10 #include "content/common/socket_stream_messages.h"
12 #include "content/common/resource_messages.h" 11 #include "content/common/resource_messages.h"
12 #include "content/public/browser/content_browser_client.h"
13 #include "net/base/cookie_monster.h" 13 #include "net/base/cookie_monster.h"
14 #include "net/url_request/url_request_context_getter.h" 14 #include "net/url_request/url_request_context_getter.h"
15 #include "net/websockets/websocket_job.h" 15 #include "net/websockets/websocket_job.h"
16 #include "net/websockets/websocket_throttle.h" 16 #include "net/websockets/websocket_throttle.h"
17 17
18 SocketStreamDispatcherHost::SocketStreamDispatcherHost( 18 SocketStreamDispatcherHost::SocketStreamDispatcherHost(
19 ResourceMessageFilter::URLRequestContextSelector* selector, 19 ResourceMessageFilter::URLRequestContextSelector* selector,
20 const content::ResourceContext* resource_context) 20 const content::ResourceContext* resource_context)
21 : url_request_context_selector_(selector), 21 : url_request_context_selector_(selector),
22 resource_context_(resource_context) { 22 resource_context_(resource_context) {
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 hosts_.Remove(socket_id); 164 hosts_.Remove(socket_id);
165 if (!Send(new SocketStreamMsg_Closed(socket_id))) { 165 if (!Send(new SocketStreamMsg_Closed(socket_id))) {
166 LOG(ERROR) << "SocketStreamMsg_Closed failed."; 166 LOG(ERROR) << "SocketStreamMsg_Closed failed.";
167 } 167 }
168 } 168 }
169 169
170 net::URLRequestContext* SocketStreamDispatcherHost::GetURLRequestContext() { 170 net::URLRequestContext* SocketStreamDispatcherHost::GetURLRequestContext() {
171 return url_request_context_selector_->GetRequestContext( 171 return url_request_context_selector_->GetRequestContext(
172 ResourceType::SUB_RESOURCE); 172 ResourceType::SUB_RESOURCE);
173 } 173 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698