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

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

Issue 12330073: Disable ProfileKeyedServices on import process by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to ToT Created 7 years, 9 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
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 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 protocol_handler_registry->CreateJobInterceptorFactory(); 253 protocol_handler_registry->CreateJobInterceptorFactory();
254 254
255 ChromeProxyConfigService* proxy_config_service = 255 ChromeProxyConfigService* proxy_config_service =
256 ProxyServiceFactory::CreateProxyConfigService(); 256 ProxyServiceFactory::CreateProxyConfigService();
257 params->proxy_config_service.reset(proxy_config_service); 257 params->proxy_config_service.reset(proxy_config_service);
258 profile->GetProxyConfigTracker()->SetChromeProxyConfigService( 258 profile->GetProxyConfigTracker()->SetChromeProxyConfigService(
259 proxy_config_service); 259 proxy_config_service);
260 #if defined(ENABLE_MANAGED_USERS) 260 #if defined(ENABLE_MANAGED_USERS)
261 ManagedUserService* managed_user_service = 261 ManagedUserService* managed_user_service =
262 ManagedUserServiceFactory::GetForProfile(profile); 262 ManagedUserServiceFactory::GetForProfile(profile);
263 params->managed_mode_url_filter = 263 if (managed_user_service) {
264 managed_user_service->GetURLFilterForIOThread(); 264 params->managed_mode_url_filter =
265 managed_user_service->GetURLFilterForIOThread();
266 }
265 #endif 267 #endif
266 268
267 params->profile = profile; 269 params->profile = profile;
268 profile_params_.reset(params.release()); 270 profile_params_.reset(params.release());
269 271
270 ChromeNetworkDelegate::InitializePrefsOnUIThread( 272 ChromeNetworkDelegate::InitializePrefsOnUIThread(
271 &enable_referrers_, 273 &enable_referrers_,
272 &enable_do_not_track_, 274 &enable_do_not_track_,
273 &force_safesearch_, 275 &force_safesearch_,
274 pref_service); 276 pref_service);
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
833 void ProfileIOData::SetCookieSettingsForTesting( 835 void ProfileIOData::SetCookieSettingsForTesting(
834 CookieSettings* cookie_settings) { 836 CookieSettings* cookie_settings) {
835 DCHECK(!cookie_settings_.get()); 837 DCHECK(!cookie_settings_.get());
836 cookie_settings_ = cookie_settings; 838 cookie_settings_ = cookie_settings;
837 } 839 }
838 840
839 void ProfileIOData::set_signin_names_for_testing( 841 void ProfileIOData::set_signin_names_for_testing(
840 SigninNamesOnIOThread* signin_names) { 842 SigninNamesOnIOThread* signin_names) {
841 signin_names_.reset(signin_names); 843 signin_names_.reset(signin_names);
842 } 844 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698