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

Side by Side Diff: net/url_request/url_request_context_storage.cc

Issue 2041863002: Remove HttpServerProperies::GetWeakPtr(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 6 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
« no previous file with comments | « net/url_request/url_request_context.cc ('k') | no next file » | 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/url_request/url_request_context_storage.h" 5 #include "net/url_request/url_request_context_storage.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "net/base/network_delegate.h" 10 #include "net/base/network_delegate.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 network_delegate_ = std::move(network_delegate); 81 network_delegate_ = std::move(network_delegate);
82 } 82 }
83 83
84 void URLRequestContextStorage::set_proxy_delegate( 84 void URLRequestContextStorage::set_proxy_delegate(
85 std::unique_ptr<ProxyDelegate> proxy_delegate) { 85 std::unique_ptr<ProxyDelegate> proxy_delegate) {
86 proxy_delegate_ = std::move(proxy_delegate); 86 proxy_delegate_ = std::move(proxy_delegate);
87 } 87 }
88 88
89 void URLRequestContextStorage::set_http_server_properties( 89 void URLRequestContextStorage::set_http_server_properties(
90 std::unique_ptr<HttpServerProperties> http_server_properties) { 90 std::unique_ptr<HttpServerProperties> http_server_properties) {
91 context_->set_http_server_properties(http_server_properties.get());
91 http_server_properties_ = std::move(http_server_properties); 92 http_server_properties_ = std::move(http_server_properties);
92 context_->set_http_server_properties(http_server_properties_->GetWeakPtr());
93 } 93 }
94 94
95 void URLRequestContextStorage::set_cookie_store( 95 void URLRequestContextStorage::set_cookie_store(
96 std::unique_ptr<CookieStore> cookie_store) { 96 std::unique_ptr<CookieStore> cookie_store) {
97 context_->set_cookie_store(cookie_store.get()); 97 context_->set_cookie_store(cookie_store.get());
98 cookie_store_ = std::move(cookie_store); 98 cookie_store_ = std::move(cookie_store);
99 } 99 }
100 100
101 void URLRequestContextStorage::set_transport_security_state( 101 void URLRequestContextStorage::set_transport_security_state(
102 std::unique_ptr<TransportSecurityState> transport_security_state) { 102 std::unique_ptr<TransportSecurityState> transport_security_state) {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 http_user_agent_settings_ = std::move(http_user_agent_settings); 139 http_user_agent_settings_ = std::move(http_user_agent_settings);
140 } 140 }
141 141
142 void URLRequestContextStorage::set_sdch_manager( 142 void URLRequestContextStorage::set_sdch_manager(
143 std::unique_ptr<SdchManager> sdch_manager) { 143 std::unique_ptr<SdchManager> sdch_manager) {
144 context_->set_sdch_manager(sdch_manager.get()); 144 context_->set_sdch_manager(sdch_manager.get());
145 sdch_manager_ = std::move(sdch_manager); 145 sdch_manager_ = std::move(sdch_manager);
146 } 146 }
147 147
148 } // namespace net 148 } // namespace net
OLDNEW
« no previous file with comments | « net/url_request/url_request_context.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698