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

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

Issue 138163015: More fixes to enable ios build with policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed obsolete files from gyp Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('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 898 matching lines...) Expand 10 before | Expand all | Expand 10 after
909 extensions_request_context_.reset(new ChromeURLRequestContext()); 909 extensions_request_context_.reset(new ChromeURLRequestContext());
910 910
911 ChromeNetworkDelegate* network_delegate = 911 ChromeNetworkDelegate* network_delegate =
912 new ChromeNetworkDelegate( 912 new ChromeNetworkDelegate(
913 io_thread_globals->extension_event_router_forwarder.get(), 913 io_thread_globals->extension_event_router_forwarder.get(),
914 &enable_referrers_); 914 &enable_referrers_);
915 if (command_line.HasSwitch(switches::kEnableClientHints)) 915 if (command_line.HasSwitch(switches::kEnableClientHints))
916 network_delegate->SetEnableClientHints(); 916 network_delegate->SetEnableClientHints();
917 network_delegate->set_extension_info_map( 917 network_delegate->set_extension_info_map(
918 profile_params_->extension_info_map.get()); 918 profile_params_->extension_info_map.get());
919 #if defined(ENABLE_CONFIGURATION_POLICY)
919 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); 920 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get());
921 #endif
920 network_delegate->set_profile(profile_params_->profile); 922 network_delegate->set_profile(profile_params_->profile);
921 network_delegate->set_profile_path(profile_params_->path); 923 network_delegate->set_profile_path(profile_params_->path);
922 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); 924 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get());
923 network_delegate->set_enable_do_not_track(&enable_do_not_track_); 925 network_delegate->set_enable_do_not_track(&enable_do_not_track_);
924 network_delegate->set_force_google_safe_search(&force_safesearch_); 926 network_delegate->set_force_google_safe_search(&force_safesearch_);
925 network_delegate_.reset(network_delegate); 927 network_delegate_.reset(network_delegate);
926 928
927 fraudulent_certificate_reporter_.reset( 929 fraudulent_certificate_reporter_.reset(
928 new chrome_browser_net::ChromeFraudulentCertificateReporter( 930 new chrome_browser_net::ChromeFraudulentCertificateReporter(
929 main_request_context_.get())); 931 main_request_context_.get()));
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
1123 void ProfileIOData::SetCookieSettingsForTesting( 1125 void ProfileIOData::SetCookieSettingsForTesting(
1124 CookieSettings* cookie_settings) { 1126 CookieSettings* cookie_settings) {
1125 DCHECK(!cookie_settings_.get()); 1127 DCHECK(!cookie_settings_.get());
1126 cookie_settings_ = cookie_settings; 1128 cookie_settings_ = cookie_settings;
1127 } 1129 }
1128 1130
1129 void ProfileIOData::set_signin_names_for_testing( 1131 void ProfileIOData::set_signin_names_for_testing(
1130 SigninNamesOnIOThread* signin_names) { 1132 SigninNamesOnIOThread* signin_names) {
1131 signin_names_.reset(signin_names); 1133 signin_names_.reset(signin_names);
1132 } 1134 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698