components/gcm_driver/registration_info.h - 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: components/gcm_driver/registration_info.h

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: Fix thestig nits and Chrome OS compile Created 4 years, 4 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

« components/gcm_driver/gcm_profile_service.h ('K') | « components/gcm_driver/instance_id/instance_id_impl.cc ('k') | components/gcm_driver/registration_info.cc » ('j') | google_apis/gcm/engine/registration_request.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/gcm_driver/registration_info.h

diff --git a/components/gcm_driver/registration_info.h b/components/gcm_driver/registration_info.h

index b9ba0a1b038c78f32ef11219796ef64f7eff4490..f33f31dc0ce48043a706c44ff2d87d8749129b02 100644

--- a/components/gcm_driver/registration_info.h

+++ b/components/gcm_driver/registration_info.h

@@ -104,8 +104,14 @@ struct InstanceIDTokenInfo : public RegistrationInfo {

// E.g. for sending GCM messages, 'GCM' scope should be used.

std::string scope;

+ // Whether to send |app_id| to GCM as the "subtype" field (supported on all

+ // platforms) or as the "category" field (not supported on Android, since

+ // Google Play Services always sends the app package name as "category").

+ bool use_subtype;

// Allows including a small number of string key/value pairs that will be

- // associated with the token and may be used in processing the request.

+ // associated with the token and may be used in processing the request. These

+ // are not serialized/deserialized.

std::map<std::string, std::string> options;

};