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

Side by Side Diff: chrome/browser/profiles/profile_io_data.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
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 "chrome/browser/profiles/profile_io_data.h" 5 #include "chrome/browser/profiles/profile_io_data.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 898 matching lines...) Expand 10 before | Expand all | Expand 10 after
909 chrome_browser_net::Predictor* ProfileIOData::GetPredictor() { 909 chrome_browser_net::Predictor* ProfileIOData::GetPredictor() {
910 return nullptr; 910 return nullptr;
911 } 911 }
912 912
913 void ProfileIOData::set_data_reduction_proxy_io_data( 913 void ProfileIOData::set_data_reduction_proxy_io_data(
914 std::unique_ptr<data_reduction_proxy::DataReductionProxyIOData> 914 std::unique_ptr<data_reduction_proxy::DataReductionProxyIOData>
915 data_reduction_proxy_io_data) const { 915 data_reduction_proxy_io_data) const {
916 data_reduction_proxy_io_data_ = std::move(data_reduction_proxy_io_data); 916 data_reduction_proxy_io_data_ = std::move(data_reduction_proxy_io_data);
917 } 917 }
918 918
919 base::WeakPtr<net::HttpServerProperties> 919 net::HttpServerProperties* ProfileIOData::http_server_properties() const {
920 ProfileIOData::http_server_properties() const { 920 return http_server_properties_.get();
921 return http_server_properties_->GetWeakPtr();
922 } 921 }
923 922
924 void ProfileIOData::set_http_server_properties( 923 void ProfileIOData::set_http_server_properties(
925 std::unique_ptr<net::HttpServerProperties> http_server_properties) const { 924 std::unique_ptr<net::HttpServerProperties> http_server_properties) const {
926 http_server_properties_ = std::move(http_server_properties); 925 http_server_properties_ = std::move(http_server_properties);
927 } 926 }
928 927
929 ProfileIOData::ResourceContext::ResourceContext(ProfileIOData* io_data) 928 ProfileIOData::ResourceContext::ResourceContext(ProfileIOData* io_data)
930 : io_data_(io_data), 929 : io_data_(io_data),
931 host_resolver_(NULL), 930 host_resolver_(NULL),
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
1359 void ProfileIOData::SetCookieSettingsForTesting( 1358 void ProfileIOData::SetCookieSettingsForTesting(
1360 content_settings::CookieSettings* cookie_settings) { 1359 content_settings::CookieSettings* cookie_settings) {
1361 DCHECK(!cookie_settings_.get()); 1360 DCHECK(!cookie_settings_.get());
1362 cookie_settings_ = cookie_settings; 1361 cookie_settings_ = cookie_settings;
1363 } 1362 }
1364 1363
1365 policy::URLBlacklist::URLBlacklistState ProfileIOData::GetURLBlacklistState( 1364 policy::URLBlacklist::URLBlacklistState ProfileIOData::GetURLBlacklistState(
1366 const GURL& url) const { 1365 const GURL& url) const {
1367 return url_blacklist_manager_->GetURLBlacklistState(url); 1366 return url_blacklist_manager_->GetURLBlacklistState(url);
1368 } 1367 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | chromecast/browser/url_request_context_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698