chrome/browser/extensions/api/copresence/copresence_api.cc - Issue 713643002: Revert "Adding GCM support to the copresence component. The Copresence server can push directives (…

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/extensions/api/copresence/copresence_api.cc

Issue 713643002: Revert "Adding GCM support to the copresence component. The Copresence server can push directives (… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2214

Patch Set: Created 6 years, 1 month 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/api/copresence/copresence_api.h ('k') | chrome/browser/services/gcm/gcm_account_tracker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/copresence/copresence_api.cc

diff --git a/chrome/browser/extensions/api/copresence/copresence_api.cc b/chrome/browser/extensions/api/copresence/copresence_api.cc

index f4ae23e05bf93849a46454c645903560a43736f2..7e9167474fe7f4e46d8874637f3c839a561301ac 100644

--- a/chrome/browser/extensions/api/copresence/copresence_api.cc

+++ b/chrome/browser/extensions/api/copresence/copresence_api.cc

@@ -7,8 +7,6 @@

#include "base/lazy_instance.h"

#include "base/memory/linked_ptr.h"

#include "chrome/browser/copresence/chrome_whispernet_client.h"

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

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

#include "chrome/common/chrome_version_info.h"

#include "chrome/common/extensions/api/copresence.h"

#include "components/copresence/copresence_manager_impl.h"

@@ -147,11 +145,6 @@ copresence::WhispernetClient* CopresenceService::GetWhispernetClient() {

return whispernet_client();

}

-gcm::GCMDriver* CopresenceService::GetGCMDriver() {

- return gcm::GCMProfileServiceFactory::GetForProfile(browser_context_)

- ->driver();

template <>

void

BrowserContextKeyedAPIFactory<CopresenceService>::DeclareFactoryDependencies() {

« no previous file with comments | « chrome/browser/extensions/api/copresence/copresence_api.h ('k') | chrome/browser/services/gcm/gcm_account_tracker.h » ('j') | no next file with comments »