| 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_impl.h" | 5 #include "chrome/browser/profiles/profile_impl.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 463 managed_user_settings = | 463 managed_user_settings = |
| 464 ManagedUserSettingsServiceFactory::GetForProfile(this); | 464 ManagedUserSettingsServiceFactory::GetForProfile(this); |
| 465 managed_user_settings->Init( | 465 managed_user_settings->Init( |
| 466 path_, sequenced_task_runner, create_mode == CREATE_MODE_SYNCHRONOUS); | 466 path_, sequenced_task_runner, create_mode == CREATE_MODE_SYNCHRONOUS); |
| 467 #endif | 467 #endif |
| 468 | 468 |
| 469 scoped_refptr<SafeBrowsingService> safe_browsing_service( | 469 scoped_refptr<SafeBrowsingService> safe_browsing_service( |
| 470 g_browser_process->safe_browsing_service()); | 470 g_browser_process->safe_browsing_service()); |
| 471 if (safe_browsing_service) { | 471 if (safe_browsing_service) { |
| 472 pref_validation_delegate_ = | 472 pref_validation_delegate_ = |
| 473 safe_browsing_service->CreatePreferenceValidationDelegate().Pass(); | 473 safe_browsing_service->CreatePreferenceValidationDelegate(this).Pass(); |
| 474 } | 474 } |
| 475 | 475 |
| 476 { | 476 { |
| 477 // On startup, preference loading is always synchronous so a scoped timer | 477 // On startup, preference loading is always synchronous so a scoped timer |
| 478 // will work here. | 478 // will work here. |
| 479 startup_metric_utils::ScopedSlowStartupUMA | 479 startup_metric_utils::ScopedSlowStartupUMA |
| 480 scoped_timer("Startup.SlowStartupPreferenceLoading"); | 480 scoped_timer("Startup.SlowStartupPreferenceLoading"); |
| 481 prefs_ = chrome_prefs::CreateProfilePrefs( | 481 prefs_ = chrome_prefs::CreateProfilePrefs( |
| 482 path_, | 482 path_, |
| 483 sequenced_task_runner, | 483 sequenced_task_runner, |
| (...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1322 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { | 1322 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { |
| 1323 #if defined(OS_CHROMEOS) | 1323 #if defined(OS_CHROMEOS) |
| 1324 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 1324 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
| 1325 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 1325 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
| 1326 g_browser_process->local_state()); | 1326 g_browser_process->local_state()); |
| 1327 } | 1327 } |
| 1328 #endif // defined(OS_CHROMEOS) | 1328 #endif // defined(OS_CHROMEOS) |
| 1329 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 1329 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
| 1330 GetPrefs(), g_browser_process->local_state()); | 1330 GetPrefs(), g_browser_process->local_state()); |
| 1331 } | 1331 } |
| OLD | NEW |