chrome/browser/profiles/profile_impl.cc - Issue 1110723002: Split to SafeBrowsingDatabaseManager into Local* and Remote*.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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: Move delegate mgmt to sb service. Use weak_ptr for ClientRequest 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/prerender/prerender_browsertest.cc ('k') | chrome/browser/renderer_host/safe_browsing_resource_throttle.cc » ('j') | chrome/browser/safe_browsing/android_safe_browsing_api_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_impl.cc

diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc

index f1767ec36cdba33f90c7fef7081437fbd3a4f539..95ce36e55390f4cd234a2a8b1338dfaa15fa5d5c 100644

--- a/chrome/browser/profiles/profile_impl.cc

+++ b/chrome/browser/profiles/profile_impl.cc

@@ -834,11 +834,10 @@ void ProfileImpl::OnPrefsLoaded(bool success) {

// TODO(sky): remove this in a couple of releases (m28ish).

prefs_->SetBoolean(prefs::kSessionExitedCleanly, true);

-#if defined(OS_ANDROID) && defined(FULL_SAFE_BROWSING)

- // Clear safe browsing setting in the case we need to roll back

- // for users enrolled in Finch trial before.

- if (!SafeBrowsingService::IsEnabledByFieldTrial())

- prefs_->ClearPref(prefs::kSafeBrowsingEnabled);

+#if defined(SAFE_BROWSING_DB_REMOTE)

+ // Hardcode this pref on this build of Android until the UX is developed.

+ // http://crbug.com/481558

+ prefs_->SetBoolean(prefs::kSafeBrowsingEnabled, true);

#endif

g_browser_process->profile_manager()->InitProfileUserPrefs(this);