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

Side by Side Diff: net/socket_stream/socket_stream_job.cc

Issue 12680003: net: split net/ssl out of net/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 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
« no previous file with comments | « net/socket_stream/socket_stream.cc ('k') | net/spdy/spdy_credential_builder.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "net/socket_stream/socket_stream_job.h" 5 #include "net/socket_stream/socket_stream_job.h"
6 6
7 #include "base/memory/singleton.h" 7 #include "base/memory/singleton.h"
8 #include "net/base/ssl_config_service.h" 8 #include "net/http/transport_security_state.h"
9 #include "net/base/transport_security_state.h"
10 #include "net/socket_stream/socket_stream_job_manager.h" 9 #include "net/socket_stream/socket_stream_job_manager.h"
10 #include "net/ssl/ssl_config_service.h"
11 #include "net/url_request/url_request_context.h" 11 #include "net/url_request/url_request_context.h"
12 12
13 namespace net { 13 namespace net {
14 14
15 // static 15 // static
16 SocketStreamJob::ProtocolFactory* SocketStreamJob::RegisterProtocolFactory( 16 SocketStreamJob::ProtocolFactory* SocketStreamJob::RegisterProtocolFactory(
17 const std::string& scheme, ProtocolFactory* factory) { 17 const std::string& scheme, ProtocolFactory* factory) {
18 return SocketStreamJobManager::GetInstance()->RegisterProtocolFactory( 18 return SocketStreamJobManager::GetInstance()->RegisterProtocolFactory(
19 scheme, factory); 19 scheme, factory);
20 } 20 }
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 socket_->ContinueDespiteError(); 78 socket_->ContinueDespiteError();
79 } 79 }
80 80
81 void SocketStreamJob::DetachDelegate() { 81 void SocketStreamJob::DetachDelegate() {
82 socket_->DetachDelegate(); 82 socket_->DetachDelegate();
83 } 83 }
84 84
85 SocketStreamJob::~SocketStreamJob() {} 85 SocketStreamJob::~SocketStreamJob() {}
86 86
87 } // namespace net 87 } // namespace net
OLDNEW
« no previous file with comments | « net/socket_stream/socket_stream.cc ('k') | net/spdy/spdy_credential_builder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698