chrome/browser/services/gcm/push_messaging_service_impl.cc - Issue 591443002: Componentize permission_request_id.*

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

Issue 591443002: Componentize permission_request_id.* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years, 3 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/services/gcm/push_messaging_service_impl.cc

diff --git a/chrome/browser/services/gcm/push_messaging_service_impl.cc b/chrome/browser/services/gcm/push_messaging_service_impl.cc

index db9a8a2ef54aa8b746e0281bd333a9fd9947071c..ec7b461420d340288fffabedf7ac30dc566b2b98 100644

--- a/chrome/browser/services/gcm/push_messaging_service_impl.cc

+++ b/chrome/browser/services/gcm/push_messaging_service_impl.cc

@@ -10,7 +10,6 @@

#include "base/command_line.h"

#include "base/prefs/pref_service.h"

#include "base/strings/string_util.h"

-#include "chrome/browser/content_settings/permission_request_id.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/services/gcm/gcm_profile_service.h"

#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"

@@ -19,6 +18,7 @@

#include "chrome/browser/services/gcm/push_messaging_permission_context_factory.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

+#include "components/content_settings/core/common/permission_request_id.h"

#include "components/gcm_driver/gcm_driver.h"

#include "components/pref_registry/pref_registry_syncable.h"

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