chrome/browser/metrics/chrome_metrics_services_manager_client.cc - Issue 1420053005: Move code in components/safe_browsing_db and chrome/browser/s_b/ under the safe_browsing namespace.

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/metrics/chrome_metrics_services_manager_client.cc

Issue 1420053005: Move code in components/safe_browsing_db and chrome/browser/s_b/ under the safe_browsing namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@02_components_move

Patch Set: Merging the latest changes from trunk. Created 5 years, 1 month 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

« chrome/browser/extensions/blacklist.cc ('K') | « chrome/browser/metrics/chrome_metrics_services_manager_client.h ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | chrome/browser/safe_browsing/incident_reporting/off_domain_inclusion_detector.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/metrics/chrome_metrics_services_manager_client.cc

diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc

index 81188abb9677b3043801bd3041a1ed3d665a6fde..83dcd36297761b113e3ed8cc0708a459b0eb4de0 100644

--- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc

+++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc

@@ -73,7 +73,8 @@ bool ChromeMetricsServicesManagerClient::IsSafeBrowsingEnabled(

// Start listening for updates to SB service state. This is done here instead

// of in the constructor to avoid errors from trying to instantiate SB

// service before the IO thread exists.

- SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service();

+ safe_browsing::SafeBrowsingService* sb_service =

+ g_browser_process->safe_browsing_service();

if (!sb_state_subscription_ && sb_service) {

// It is safe to pass the callback received from the

// MetricsServicesManager here since the MetricsServicesManager owns