Added new DriveNotificationObserver interface which all observers of Google Drive invalidations sho…

chrome/browser/sync_file_system/drive_file_sync_service.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_
 
 #include <deque>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/timer.h"
+#include "chrome/browser/google_apis/drive_notification_observer.h"
 #include "chrome/browser/sync_file_system/drive_file_sync_client_interface.h"
 #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"
 #include "webkit/fileapi/syncable/sync_direction.h"
 #include "webkit/fileapi/syncable/sync_status_code.h"
@@ skipping 10 matching lines @@
 
 namespace sync_file_system {
 
 // Maintains remote file changes.
 // Owned by SyncFileSystemService (which is a per-profile object).
 class DriveFileSyncService
     : public RemoteFileSyncService,
       public LocalChangeProcessor,
       public DriveFileSyncClientObserver,
       public base::NonThreadSafe,
-      public syncer::InvalidationHandler {
+      public syncer::InvalidationHandler,
+      public google_apis::DriveNotificationObserver {
  public:
   static const char kServiceName[];
   static ConflictResolutionPolicy kDefaultPolicy;
 
   explicit DriveFileSyncService(Profile* profile);
   virtual ~DriveFileSyncService();
 
   // Creates DriveFileSyncClient instance for testing.
   // |metadata_store| must be initialized beforehand.
   static scoped_ptr<DriveFileSyncService> CreateForTesting(
@@ skipping 52 matching lines @@
   // DriveFileSyncClientObserver overrides.
   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();

[tzik, 2013/04/09 08:31:34]

Please add OVERRIDE.

[calvinlo, 2013/04/09 08:44:20]

Done.

+
  private:
   friend class DriveFileSyncServiceMockTest;
   friend class DriveFileSyncServiceSyncTest;
   class TaskToken;
   struct ApplyLocalChangeParam;
   struct ProcessRemoteChangeParam;
 
   enum RemoteSyncType {
     // Smaller number indicates higher priority in ChangeQueue.
     REMOTE_SYNC_TYPE_FETCH = 0,
@@ skipping 396 matching lines @@
   // Use WeakPtrFactory instead of SupportsWeakPtr to revoke the weak pointer
   // in |token_|.
   base::WeakPtrFactory<DriveFileSyncService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DriveFileSyncService);
 };
 
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_