chrome/browser/sync/profile_sync_service.h - Issue 13991017: Commit InvalidationService implementations

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/sync/profile_sync_service.h

Issue 13991017: Commit InvalidationService implementations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Another attempt to fix Android Created 7 years, 7 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

« chrome/browser/invalidation/ticl_invalidation_service.cc ('K') | « chrome/browser/sync/invalidations/invalidator_storage_unittest.cc ('k') | chrome/browser/sync/test_profile_sync_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_service.h

diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h

index 5d3a4531f7aa8c883ed30bd8ed53931b1117f4b6..5e2f07f6d48598084ea9e11f96fcba9b8232e83d 100644

--- a/chrome/browser/sync/profile_sync_service.h

+++ b/chrome/browser/sync/profile_sync_service.h

@@ -20,6 +20,8 @@

#include "base/string16.h"

#include "base/time.h"

#include "base/timer.h"

+#include "chrome/browser/invalidation/invalidation_frontend.h"

+#include "chrome/browser/invalidation/invalidator_storage.h"

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

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

#include "chrome/browser/sync/backend_unrecoverable_error_handler.h"

@@ -28,8 +30,6 @@

#include "chrome/browser/sync/glue/data_type_manager.h"

#include "chrome/browser/sync/glue/data_type_manager_observer.h"

#include "chrome/browser/sync/glue/sync_backend_host.h"

-#include "chrome/browser/sync/invalidation_frontend.h"

-#include "chrome/browser/sync/invalidations/invalidator_storage.h"

#include "chrome/browser/sync/profile_sync_service_base.h"

#include "chrome/browser/sync/profile_sync_service_observer.h"

#include "chrome/browser/sync/sync_prefs.h"

@@ -162,7 +162,7 @@ class ProfileSyncService : public ProfileSyncServiceBase,

public syncer::UnrecoverableErrorHandler,

public content::NotificationObserver,

public ProfileKeyedService,

- public InvalidationFrontend {

+ public invalidation::InvalidationFrontend {

public:

typedef browser_sync::SyncBackendHost::Status Status;

@@ -814,7 +814,7 @@ class ProfileSyncService : public ProfileSyncServiceBase,

browser_sync::SyncPrefs sync_prefs_;

// TODO(tim): Move this to InvalidationService, once it exists. Bug 124137.

- browser_sync::InvalidatorStorage invalidator_storage_;

+ invalidation::InvalidatorStorage invalidator_storage_;

// TODO(ncarter): Put this in a profile, once there is UI for it.

// This specifies where to find the sync server.