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

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

Issue 341563003: Safe browsing incident reporting service improvements. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync to r278347 Created 6 years, 6 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_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 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 supervised_user_settings = 447 supervised_user_settings =
448 SupervisedUserSettingsServiceFactory::GetForProfile(this); 448 SupervisedUserSettingsServiceFactory::GetForProfile(this);
449 supervised_user_settings->Init( 449 supervised_user_settings->Init(
450 path_, sequenced_task_runner, create_mode == CREATE_MODE_SYNCHRONOUS); 450 path_, sequenced_task_runner, create_mode == CREATE_MODE_SYNCHRONOUS);
451 #endif 451 #endif
452 452
453 scoped_refptr<SafeBrowsingService> safe_browsing_service( 453 scoped_refptr<SafeBrowsingService> safe_browsing_service(
454 g_browser_process->safe_browsing_service()); 454 g_browser_process->safe_browsing_service());
455 if (safe_browsing_service) { 455 if (safe_browsing_service) {
456 pref_validation_delegate_ = 456 pref_validation_delegate_ =
457 safe_browsing_service->CreatePreferenceValidationDelegate().Pass(); 457 safe_browsing_service->CreatePreferenceValidationDelegate(this).Pass();
458 } 458 }
459 459
460 { 460 {
461 // On startup, preference loading is always synchronous so a scoped timer 461 // On startup, preference loading is always synchronous so a scoped timer
462 // will work here. 462 // will work here.
463 startup_metric_utils::ScopedSlowStartupUMA 463 startup_metric_utils::ScopedSlowStartupUMA
464 scoped_timer("Startup.SlowStartupPreferenceLoading"); 464 scoped_timer("Startup.SlowStartupPreferenceLoading");
465 prefs_ = chrome_prefs::CreateProfilePrefs( 465 prefs_ = chrome_prefs::CreateProfilePrefs(
466 path_, 466 path_,
467 sequenced_task_runner, 467 sequenced_task_runner,
(...skipping 840 matching lines...) Expand 10 before | Expand all | Expand 10 after
1308 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { 1308 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() {
1309 #if defined(OS_CHROMEOS) 1309 #if defined(OS_CHROMEOS)
1310 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 1310 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
1311 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 1311 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
1312 g_browser_process->local_state()); 1312 g_browser_process->local_state());
1313 } 1313 }
1314 #endif // defined(OS_CHROMEOS) 1314 #endif // defined(OS_CHROMEOS)
1315 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 1315 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
1316 GetPrefs(), g_browser_process->local_state()); 1316 GetPrefs(), g_browser_process->local_state());
1317 } 1317 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698