chrome/browser/browser_process_impl.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/browser_process_impl.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: Fix iOS 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

« no previous file with comments | « no previous file | chrome/browser/extensions/api/instance_id/instance_id_api.cc » ('j') | chrome/browser/extensions/extension_gcm_app_handler_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/browser_process_impl.cc

diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc

index 285c69849e08b8f24a1185b82480e4c9f6bc3d8b..581b21f2a037870e88c32af98c2197cd1e388083 100644

--- a/chrome/browser/browser_process_impl.cc

+++ b/chrome/browser/browser_process_impl.cc

@@ -129,6 +129,7 @@

#if !defined(OS_ANDROID)

#include "chrome/browser/lifetime/keep_alive_registry.h"

+#include "chrome/browser/services/gcm/gcm_product_util.h"

#include "chrome/browser/ui/user_manager.h"

#include "components/gcm_driver/gcm_client_factory.h"

#include "components/gcm_driver/gcm_desktop_utils.h"

@@ -1187,6 +1188,7 @@ void BrowserProcessImpl::CreateGCMDriver() {

gcm_driver_ = gcm::CreateGCMDriverDesktop(

base::WrapUnique(new gcm::GCMClientFactory), local_state(), store_path,

system_request_context(), chrome::GetChannel(),

+ gcm::GetProductCategoryForSubtypes(local_state()),

content::BrowserThread::GetTaskRunnerForThread(

content::BrowserThread::UI),

content::BrowserThread::GetTaskRunnerForThread(