chrome/browser/push_messaging/push_messaging_service_impl.cc - Issue 1658793002: Update chrome for new prefs location.

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/push_messaging/push_messaging_service_impl.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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:

Index: chrome/browser/push_messaging/push_messaging_service_impl.cc

diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.cc b/chrome/browser/push_messaging/push_messaging_service_impl.cc

index 7d5f26fbeb49227db112ba5eb483ef3bd31ad36b..b8725fc67189a4ed51fd419acbae9a2008eb4523 100644

--- a/chrome/browser/push_messaging/push_messaging_service_impl.cc

+++ b/chrome/browser/push_messaging/push_messaging_service_impl.cc

@@ -14,7 +14,6 @@

#include "base/logging.h"

#include "base/metrics/field_trial.h"

#include "base/metrics/histogram.h"

-#include "base/prefs/pref_service.h"

#include "build/build_config.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/content_settings/host_content_settings_map_factory.h"

@@ -33,6 +32,7 @@

#include "components/gcm_driver/gcm_driver.h"

#include "components/gcm_driver/gcm_profile_service.h"

#include "components/pref_registry/pref_registry_syncable.h"

+#include "components/prefs/pref_service.h"

#include "components/rappor/rappor_utils.h"

#include "content/public/browser/browser_context.h"

#include "content/public/browser/permission_type.h"