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

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

Issue 1110723002: Split to SafeBrowsingDatabaseManager into Local* and Remote*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Respond to review. Tweak comments and list initializer. Created 5 years, 7 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
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 816 matching lines...) Expand 10 before | Expand all | Expand 10 after
827 } else { 827 } else {
828 last_session_exit_type_ = 828 last_session_exit_type_ =
829 SessionTypePrefValueToExitType(exit_type_pref_value); 829 SessionTypePrefValueToExitType(exit_type_pref_value);
830 } 830 }
831 // Mark the session as open. 831 // Mark the session as open.
832 prefs_->SetString(prefs::kSessionExitType, kPrefExitTypeCrashed); 832 prefs_->SetString(prefs::kSessionExitType, kPrefExitTypeCrashed);
833 // Force this to true in case we fallback and use it. 833 // Force this to true in case we fallback and use it.
834 // TODO(sky): remove this in a couple of releases (m28ish). 834 // TODO(sky): remove this in a couple of releases (m28ish).
835 prefs_->SetBoolean(prefs::kSessionExitedCleanly, true); 835 prefs_->SetBoolean(prefs::kSessionExitedCleanly, true);
836 836
837 #if defined(OS_ANDROID) && defined(FULL_SAFE_BROWSING) 837 #if defined(SAFE_BROWSING_DB_REMOTE)
838 // Clear safe browsing setting in the case we need to roll back 838 // Hardcode this pref on this build of Android until the UX is developed.
839 // for users enrolled in Finch trial before. 839 // http://crbug.com/481558
Nico 2015/05/13 00:07:23 Why do you no longer need the field trial?
Nathan Parker 2015/05/13 00:11:23 The field trial was used last Fall to test full Sa
840 if (!SafeBrowsingService::IsEnabledByFieldTrial()) 840 prefs_->SetBoolean(prefs::kSafeBrowsingEnabled, true);
841 prefs_->ClearPref(prefs::kSafeBrowsingEnabled);
842 #endif 841 #endif
843 842
844 g_browser_process->profile_manager()->InitProfileUserPrefs(this); 843 g_browser_process->profile_manager()->InitProfileUserPrefs(this);
845 844
846 { 845 {
847 SCOPED_UMA_HISTOGRAM_TIMER("Profile.CreateBrowserContextServicesTime"); 846 SCOPED_UMA_HISTOGRAM_TIMER("Profile.CreateBrowserContextServicesTime");
848 BrowserContextDependencyManager::GetInstance()-> 847 BrowserContextDependencyManager::GetInstance()->
849 CreateBrowserContextServices(this); 848 CreateBrowserContextServices(this);
850 } 849 }
851 850
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
1296 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { 1295 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) {
1297 domain_reliability::DomainReliabilityService* service = 1296 domain_reliability::DomainReliabilityService* service =
1298 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> 1297 domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
1299 GetForBrowserContext(this); 1298 GetForBrowserContext(this);
1300 if (!service) 1299 if (!service)
1301 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); 1300 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
1302 1301
1303 return service->CreateMonitor( 1302 return service->CreateMonitor(
1304 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); 1303 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
1305 } 1304 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698