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

« components/gcm_driver/gcm_driver.h ('K') | « components/gcm_driver/gcm_profile_service.h ('k') | components/gcm_driver/instance_id/BUILD.gn » ('j') | components/gcm_driver/registration_info.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/gcm_driver/gcm_profile_service.cc

diff --git a/components/gcm_driver/gcm_profile_service.cc b/components/gcm_driver/gcm_profile_service.cc

index 6cdb49bb09e5b06a5f975c98dfe1c47e8c318b5c..65da7f68d05425fb132c3c263a9cb5531275c79a 100644

--- a/components/gcm_driver/gcm_profile_service.cc

+++ b/components/gcm_driver/gcm_profile_service.cc

@@ -140,6 +140,7 @@ GCMProfileService::GCMProfileService(

PrefService* prefs,

base::FilePath path,

net::URLRequestContextGetter* request_context,

+ const std::string& product_shortname,

version_info::Channel channel,

std::unique_ptr<ProfileIdentityProvider> identity_provider,

std::unique_ptr<GCMClientFactory> gcm_client_factory,

@@ -150,8 +151,9 @@ GCMProfileService::GCMProfileService(

request_context_(request_context) {

driver_ = CreateGCMDriverDesktop(std::move(gcm_client_factory), prefs,

path.Append(gcm_driver::kGCMStoreDirname),

- request_context_, channel, ui_task_runner,

- io_task_runner, blocking_task_runner);

+ request_context_, product_shortname, channel,

+ ui_task_runner, io_task_runner,

+ blocking_task_runner);

identity_observer_.reset(new IdentityObserver(

profile_identity_provider_.get(), request_context_, driver_.get()));