chrome/browser/invalidation/profile_invalidation_provider_factory.cc - Issue 319223002: Componentize TiclInvalidationService

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/invalidation/profile_invalidation_provider_factory.cc

Issue 319223002: Componentize TiclInvalidationService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 6 years, 6 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/invalidation/invalidation_service_test_template.cc ('k') | chrome/browser/invalidation/ticl_invalidation_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/invalidation/profile_invalidation_provider_factory.cc

diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc

index 0606f6085ffd94ccc096c9190bc3f20f63b61ab0..2f191440497511b4dd4e59cb022ba248c0b3d799 100644

--- a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc

+++ b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc

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

#include "base/memory/scoped_ptr.h"

#include "base/prefs/pref_registry.h"

#include "chrome/browser/browser_process.h"

-#include "chrome/browser/invalidation/ticl_invalidation_service.h"

#include "chrome/browser/invalidation/ticl_profile_settings_provider.h"

#include "chrome/browser/profiles/profile.h"

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

@@ -16,10 +15,12 @@

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

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

#include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"

+#include "chrome/common/chrome_content_client.h"

#include "chrome/common/pref_names.h"

#include "components/invalidation/invalidation_service.h"

#include "components/invalidation/invalidator_storage.h"

#include "components/invalidation/profile_invalidation_provider.h"

+#include "components/invalidation/ticl_invalidation_service.h"

#include "components/invalidation/ticl_settings_provider.h"

#include "components/keyed_service/content/browser_context_dependency_manager.h"

#include "components/pref_registry/pref_registry_syncable.h"

@@ -125,6 +126,7 @@ KeyedService* ProfileInvalidationProviderFactory::BuildServiceInstanceFor(

}

scoped_ptr<TiclInvalidationService> service(new TiclInvalidationService(

+ GetUserAgent(),

identity_provider.Pass(),

scoped_ptr<TiclSettingsProvider>(

new TiclProfileSettingsProvider(profile)),