Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Unified Diff: chrome/browser/sync_file_system/drive_file_sync_service.h

Issue 13866037: Ports XMPP Invalidation code from drive_file_sync_service in /sync_file_system to /google_apis/driv… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updated tests Created 7 years, 8 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
Index: chrome/browser/sync_file_system/drive_file_sync_service.h
diff --git a/chrome/browser/sync_file_system/drive_file_sync_service.h b/chrome/browser/sync_file_system/drive_file_sync_service.h
index f272333d5385602893d0eb7df421b876cbee131d..a06cb10ab76b637dcf676e799859ebeb485170f3 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_service.h
+++ b/chrome/browser/sync_file_system/drive_file_sync_service.h
@@ -22,7 +22,6 @@
#include "chrome/browser/sync_file_system/drive_metadata_store.h"
#include "chrome/browser/sync_file_system/local_change_processor.h"
#include "chrome/browser/sync_file_system/remote_file_sync_service.h"
-#include "sync/notifier/invalidation_handler.h"
#include "webkit/fileapi/syncable/file_change.h"
#include "webkit/fileapi/syncable/sync_action.h"
#include "webkit/fileapi/syncable/sync_callbacks.h"
@@ -48,7 +47,6 @@ class DriveFileSyncService
public LocalChangeProcessor,
public DriveFileSyncClientObserver,
public base::NonThreadSafe,
- public syncer::InvalidationHandler,
public google_apis::DriveNotificationObserver {
public:
static const char kServiceName[];
@@ -116,12 +114,6 @@ class DriveFileSyncService
virtual void OnAuthenticated() OVERRIDE;
virtual void OnNetworkConnected() OVERRIDE;
- // syncer::InvalidationHandler implementation.
- virtual void OnInvalidatorStateChange(
- syncer::InvalidatorState state) OVERRIDE;
- virtual void OnIncomingInvalidation(
- const syncer::ObjectIdInvalidationMap& invalidation_map) OVERRIDE;
-
// google_apis::DriveNotificationObserver implementation.
virtual void CheckForUpdates() OVERRIDE;
@@ -438,9 +430,6 @@ class DriveFileSyncService
void SchedulePolling();
void OnPollingTimerFired();
void UpdatePollingDelay(int64 new_delay_sec);
- void RegisterDriveNotifications();
- bool IsDriveNotificationSupported();
- void SetPushNotificationEnabled(syncer::InvalidatorState state);
void NotifyObserversFileStatusChanged(const fileapi::FileSystemURL& url,
SyncFileStatus sync_status,
SyncAction action_taken,
@@ -502,10 +491,6 @@ class DriveFileSyncService
// NotifyTaskDone when the task finished.
scoped_ptr<TaskToken> token_;
- // True when Drive File Sync Service is registered for Drive notifications.
- bool push_notification_registered_;
- // True once the first drive notification is received with OK state.
- bool push_notification_enabled_;
// Timer to trigger fetching changes for incremental sync.
base::OneShotTimer<DriveFileSyncService> polling_timer_;
// If polling_delay_seconds_ is negative (<0) the timer won't start.
« no previous file with comments | « chrome/browser/google_apis/drive_notification_manager.cc ('k') | chrome/browser/sync_file_system/drive_file_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698