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

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

Issue 1393073002: Add external data use observer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@datause_accounting_scliitle_cl_do_not_edit_2
Patch Set: assert added Created 5 years, 2 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 | « chrome/browser/io_thread.cc ('k') | chrome/chrome_browser.gypi » ('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 "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 1051 matching lines...) Expand 10 before | Expand all | Expand 10 after
1062 1062
1063 #if defined(ENABLE_CONFIGURATION_POLICY) 1063 #if defined(ENABLE_CONFIGURATION_POLICY)
1064 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); 1064 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get());
1065 #endif 1065 #endif
1066 network_delegate->set_profile(profile_params_->profile); 1066 network_delegate->set_profile(profile_params_->profile);
1067 network_delegate->set_profile_path(profile_params_->path); 1067 network_delegate->set_profile_path(profile_params_->path);
1068 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); 1068 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get());
1069 network_delegate->set_enable_do_not_track(&enable_do_not_track_); 1069 network_delegate->set_enable_do_not_track(&enable_do_not_track_);
1070 network_delegate->set_force_google_safe_search(&force_google_safesearch_); 1070 network_delegate->set_force_google_safe_search(&force_google_safesearch_);
1071 network_delegate->set_force_youtube_safety_mode(&force_youtube_safety_mode_); 1071 network_delegate->set_force_youtube_safety_mode(&force_youtube_safety_mode_);
1072 network_delegate->set_data_use_aggregator( 1072 network_delegate->set_data_use_aggregator(io_thread->data_use_aggregator(),
1073 io_thread_globals->data_use_aggregator.get(), IsOffTheRecord()); 1073 IsOffTheRecord());
1074 1074
1075 // NOTE: Proxy service uses the default io thread network delegate, not the 1075 // NOTE: Proxy service uses the default io thread network delegate, not the
1076 // delegate just created. 1076 // delegate just created.
1077 proxy_service_ = ProxyServiceFactory::CreateProxyService( 1077 proxy_service_ = ProxyServiceFactory::CreateProxyService(
1078 io_thread->net_log(), 1078 io_thread->net_log(),
1079 io_thread_globals->proxy_script_fetcher_context.get(), 1079 io_thread_globals->proxy_script_fetcher_context.get(),
1080 io_thread_globals->system_network_delegate.get(), 1080 io_thread_globals->system_network_delegate.get(),
1081 profile_params_->proxy_config_service.Pass(), command_line, 1081 profile_params_->proxy_config_service.Pass(), command_line,
1082 quick_check_enabled_.GetValue()); 1082 quick_check_enabled_.GetValue());
1083 transport_security_state_.reset(new net::TransportSecurityState()); 1083 transport_security_state_.reset(new net::TransportSecurityState());
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
1347 network_controller_handle_.GetController(), shared_session), 1347 network_controller_handle_.GetController(), shared_session),
1348 shared_session->net_log(), backend, 1348 shared_session->net_log(), backend,
1349 true /* set_up_quic_server_info */)); 1349 true /* set_up_quic_server_info */));
1350 } 1350 }
1351 1351
1352 void ProfileIOData::SetCookieSettingsForTesting( 1352 void ProfileIOData::SetCookieSettingsForTesting(
1353 content_settings::CookieSettings* cookie_settings) { 1353 content_settings::CookieSettings* cookie_settings) {
1354 DCHECK(!cookie_settings_.get()); 1354 DCHECK(!cookie_settings_.get());
1355 cookie_settings_ = cookie_settings; 1355 cookie_settings_ = cookie_settings;
1356 } 1356 }
OLDNEW
« no previous file with comments | « chrome/browser/io_thread.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698