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

Side by Side Diff: chrome/browser/profiles/profile_io_data.cc

Issue 1267383002: Allow preloaded pins to contain report URIs; remove special-case reporting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase fixup Created 5 years, 4 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 <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 27 matching lines...) Expand all
38 #include "chrome/browser/net/chrome_net_log.h" 38 #include "chrome/browser/net/chrome_net_log.h"
39 #include "chrome/browser/net/chrome_network_delegate.h" 39 #include "chrome/browser/net/chrome_network_delegate.h"
40 #include "chrome/browser/net/chrome_url_request_context_getter.h" 40 #include "chrome/browser/net/chrome_url_request_context_getter.h"
41 #include "chrome/browser/net/cookie_store_util.h" 41 #include "chrome/browser/net/cookie_store_util.h"
42 #include "chrome/browser/net/proxy_service_factory.h" 42 #include "chrome/browser/net/proxy_service_factory.h"
43 #include "chrome/browser/net/resource_prefetch_predictor_observer.h" 43 #include "chrome/browser/net/resource_prefetch_predictor_observer.h"
44 #include "chrome/browser/predictors/resource_prefetch_predictor.h" 44 #include "chrome/browser/predictors/resource_prefetch_predictor.h"
45 #include "chrome/browser/predictors/resource_prefetch_predictor_factory.h" 45 #include "chrome/browser/predictors/resource_prefetch_predictor_factory.h"
46 #include "chrome/browser/profiles/profile.h" 46 #include "chrome/browser/profiles/profile.h"
47 #include "chrome/browser/profiles/profile_manager.h" 47 #include "chrome/browser/profiles/profile_manager.h"
48 #include "chrome/browser/ssl/chrome_fraudulent_certificate_reporter.h"
49 #include "chrome/browser/ui/search/new_tab_page_interceptor_service.h" 48 #include "chrome/browser/ui/search/new_tab_page_interceptor_service.h"
50 #include "chrome/browser/ui/search/new_tab_page_interceptor_service_factory.h" 49 #include "chrome/browser/ui/search/new_tab_page_interceptor_service_factory.h"
51 #include "chrome/common/chrome_paths.h" 50 #include "chrome/common/chrome_paths.h"
52 #include "chrome/common/chrome_switches.h" 51 #include "chrome/common/chrome_switches.h"
53 #include "chrome/common/pref_names.h" 52 #include "chrome/common/pref_names.h"
54 #include "chrome/common/url_constants.h" 53 #include "chrome/common/url_constants.h"
55 #include "components/content_settings/core/browser/content_settings_provider.h" 54 #include "components/content_settings/core/browser/content_settings_provider.h"
56 #include "components/content_settings/core/browser/cookie_settings.h" 55 #include "components/content_settings/core/browser/cookie_settings.h"
57 #include "components/content_settings/core/browser/host_content_settings_map.h" 56 #include "components/content_settings/core/browser/host_content_settings_map.h"
58 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d ata.h" 57 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d ata.h"
(...skipping 989 matching lines...) Expand 10 before | Expand all | Expand 10 after
1048 1047
1049 #if defined(ENABLE_CONFIGURATION_POLICY) 1048 #if defined(ENABLE_CONFIGURATION_POLICY)
1050 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); 1049 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get());
1051 #endif 1050 #endif
1052 network_delegate->set_profile(profile_params_->profile); 1051 network_delegate->set_profile(profile_params_->profile);
1053 network_delegate->set_profile_path(profile_params_->path); 1052 network_delegate->set_profile_path(profile_params_->path);
1054 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); 1053 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get());
1055 network_delegate->set_enable_do_not_track(&enable_do_not_track_); 1054 network_delegate->set_enable_do_not_track(&enable_do_not_track_);
1056 network_delegate->set_force_google_safe_search(&force_google_safesearch_); 1055 network_delegate->set_force_google_safe_search(&force_google_safesearch_);
1057 network_delegate->set_force_youtube_safety_mode(&force_youtube_safety_mode_); 1056 network_delegate->set_force_youtube_safety_mode(&force_youtube_safety_mode_);
1058 fraudulent_certificate_reporter_.reset(
1059 new ChromeFraudulentCertificateReporter(main_request_context_.get()));
1060 1057
1061 // NOTE: Proxy service uses the default io thread network delegate, not the 1058 // NOTE: Proxy service uses the default io thread network delegate, not the
1062 // delegate just created. 1059 // delegate just created.
1063 proxy_service_.reset( 1060 proxy_service_.reset(
1064 ProxyServiceFactory::CreateProxyService( 1061 ProxyServiceFactory::CreateProxyService(
1065 io_thread->net_log(), 1062 io_thread->net_log(),
1066 io_thread_globals->proxy_script_fetcher_context.get(), 1063 io_thread_globals->proxy_script_fetcher_context.get(),
1067 io_thread_globals->system_network_delegate.get(), 1064 io_thread_globals->system_network_delegate.get(),
1068 profile_params_->proxy_config_service.release(), 1065 profile_params_->proxy_config_service.release(),
1069 command_line, 1066 command_line,
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
1329 new DevToolsNetworkTransactionFactory( 1326 new DevToolsNetworkTransactionFactory(
1330 network_controller_.get(), shared_session), 1327 network_controller_.get(), shared_session),
1331 shared_session->net_log(), backend)); 1328 shared_session->net_log(), backend));
1332 } 1329 }
1333 1330
1334 void ProfileIOData::SetCookieSettingsForTesting( 1331 void ProfileIOData::SetCookieSettingsForTesting(
1335 content_settings::CookieSettings* cookie_settings) { 1332 content_settings::CookieSettings* cookie_settings) {
1336 DCHECK(!cookie_settings_.get()); 1333 DCHECK(!cookie_settings_.get());
1337 cookie_settings_ = cookie_settings; 1334 cookie_settings_ = cookie_settings;
1338 } 1335 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | chrome/browser/ssl/chrome_fraudulent_certificate_reporter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698