chrome/browser/prefs/browser_prefs.cc - Issue 2111973002: Add support for GCM subtypes to desktop Instance ID implementation

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/prefs/browser_prefs.cc

Issue 2111973002: Add support for GCM subtypes to desktop Instance ID implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@iid9push

Patch Set: address most of peter's concerns Created 4 years, 5 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/extensions/extension_gcm_app_handler_unittest.cc ('k') | chrome/browser/services/gcm/gcm_profile_service_factory.cc » ('j') | components/gcm_driver.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index c62343a7f64273890169048d4d1eda0d9a8dfe7f..d5d4199e61271830fea58bc3bce3639f66bc0f4f 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -153,6 +153,7 @@

#if !defined(OS_ANDROID)

#include "chrome/browser/signin/signin_promo.h"

#include "chrome/browser/ui/webui/foreign_session_handler.h"

+#include "components/gcm_driver/gcm_desktop_utils.h"

#endif

#if defined(OS_CHROMEOS)

@@ -595,6 +596,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

#if !defined(OS_ANDROID)

browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry);

+ gcm::RegisterProfilePrefs(registry);

#endif

// Preferences registered only for migration (clearing or moving to a new key)