Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 67 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d ata.h" | 67 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d ata.h" |
| 68 #include "components/dom_distiller/core/url_constants.h" | 68 #include "components/dom_distiller/core/url_constants.h" |
| 69 #include "components/metrics/metrics_pref_names.h" | 69 #include "components/metrics/metrics_pref_names.h" |
| 70 #include "components/metrics/metrics_service.h" | 70 #include "components/metrics/metrics_service.h" |
| 71 #include "components/net_log/chrome_net_log.h" | 71 #include "components/net_log/chrome_net_log.h" |
| 72 #include "components/policy/core/browser/url_blacklist_manager.h" | 72 #include "components/policy/core/browser/url_blacklist_manager.h" |
| 73 #include "components/policy/core/common/cloud/policy_header_io_helper.h" | 73 #include "components/policy/core/common/cloud/policy_header_io_helper.h" |
| 74 #include "components/policy/core/common/cloud/policy_header_service.h" | 74 #include "components/policy/core/common/cloud/policy_header_service.h" |
| 75 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" | 75 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" |
| 76 #include "components/prefs/pref_service.h" | 76 #include "components/prefs/pref_service.h" |
| 77 #include "components/previews/previews_io_data.h" | |
| 77 #include "components/signin/core/common/signin_pref_names.h" | 78 #include "components/signin/core/common/signin_pref_names.h" |
| 78 #include "components/sync/driver/pref_names.h" | 79 #include "components/sync/driver/pref_names.h" |
| 79 #include "components/url_formatter/url_fixer.h" | 80 #include "components/url_formatter/url_fixer.h" |
| 80 #include "content/public/browser/browser_thread.h" | 81 #include "content/public/browser/browser_thread.h" |
| 81 #include "content/public/browser/host_zoom_map.h" | 82 #include "content/public/browser/host_zoom_map.h" |
| 82 #include "content/public/browser/notification_service.h" | 83 #include "content/public/browser/notification_service.h" |
| 83 #include "content/public/browser/resource_context.h" | 84 #include "content/public/browser/resource_context.h" |
| 84 #include "content/public/common/content_switches.h" | 85 #include "content/public/common/content_switches.h" |
| 85 #include "net/base/keygen_handler.h" | 86 #include "net/base/keygen_handler.h" |
| 86 #include "net/cert/cert_verifier.h" | 87 #include "net/cert/cert_verifier.h" |
| (...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 950 #error Unknown platform. | 951 #error Unknown platform. |
| 951 #endif | 952 #endif |
| 952 } | 953 } |
| 953 | 954 |
| 954 void ProfileIOData::set_data_reduction_proxy_io_data( | 955 void ProfileIOData::set_data_reduction_proxy_io_data( |
| 955 std::unique_ptr<data_reduction_proxy::DataReductionProxyIOData> | 956 std::unique_ptr<data_reduction_proxy::DataReductionProxyIOData> |
| 956 data_reduction_proxy_io_data) const { | 957 data_reduction_proxy_io_data) const { |
| 957 data_reduction_proxy_io_data_ = std::move(data_reduction_proxy_io_data); | 958 data_reduction_proxy_io_data_ = std::move(data_reduction_proxy_io_data); |
| 958 } | 959 } |
| 959 | 960 |
| 961 void ProfileIOData::set_previews_io_data( | |
| 962 std::unique_ptr<previews::PreviewsIOData> previews_io_data) const { | |
| 963 previews_io_data_ = std::move(previews_io_data); | |
|
bengr
2016/09/08 00:19:09
inline? It looks like the method before it could b
RyanSturm
2016/09/08 18:34:33
With std::move or reset, you can't only have a for
| |
| 964 } | |
| 965 | |
| 960 net::HttpServerProperties* ProfileIOData::http_server_properties() const { | 966 net::HttpServerProperties* ProfileIOData::http_server_properties() const { |
| 961 return http_server_properties_.get(); | 967 return http_server_properties_.get(); |
| 962 } | 968 } |
| 963 | 969 |
| 964 void ProfileIOData::set_http_server_properties( | 970 void ProfileIOData::set_http_server_properties( |
| 965 std::unique_ptr<net::HttpServerProperties> http_server_properties) const { | 971 std::unique_ptr<net::HttpServerProperties> http_server_properties) const { |
| 966 http_server_properties_ = std::move(http_server_properties); | 972 http_server_properties_ = std::move(http_server_properties); |
| 967 } | 973 } |
| 968 | 974 |
| 969 ProfileIOData::ResourceContext::ResourceContext(ProfileIOData* io_data) | 975 ProfileIOData::ResourceContext::ResourceContext(ProfileIOData* io_data) |
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1377 void ProfileIOData::SetCookieSettingsForTesting( | 1383 void ProfileIOData::SetCookieSettingsForTesting( |
| 1378 content_settings::CookieSettings* cookie_settings) { | 1384 content_settings::CookieSettings* cookie_settings) { |
| 1379 DCHECK(!cookie_settings_.get()); | 1385 DCHECK(!cookie_settings_.get()); |
| 1380 cookie_settings_ = cookie_settings; | 1386 cookie_settings_ = cookie_settings; |
| 1381 } | 1387 } |
| 1382 | 1388 |
| 1383 policy::URLBlacklist::URLBlacklistState ProfileIOData::GetURLBlacklistState( | 1389 policy::URLBlacklist::URLBlacklistState ProfileIOData::GetURLBlacklistState( |
| 1384 const GURL& url) const { | 1390 const GURL& url) const { |
| 1385 return url_blacklist_manager_->GetURLBlacklistState(url); | 1391 return url_blacklist_manager_->GetURLBlacklistState(url); |
| 1386 } | 1392 } |
| OLD | NEW |