Reland "Revert 156830 - drive: Stop exposing operation_registry() from DriveServiceInterface"

chrome/browser/chromeos/gdata/gdata_wapi_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_CHROMEOS_GDATA_GDATA_WAPI_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_WAPI_SERVICE_H_
 
 #include <string>
 
 #include "base/observer_list.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/gdata/drive_service_interface.h"
 #include "chrome/browser/google_apis/auth_service.h"
 #include "chrome/browser/google_apis/gdata_operations.h"
 
 class FilePath;
 class GURL;
 class Profile;
 
 namespace gdata {
 
 class OperationRunner;
 
 // This class provides documents feed service calls for WAPI (codename for
 // DocumentsList API).
 // Details of API call are abstracted in each operation class and this class
 // works as a thin wrapper for the API.
 class GDataWapiService : public DriveServiceInterface,
-                         public AuthService::Observer {
+                         public AuthService::Observer,
+                         public OperationRegistry::Observer {
  public:
   // Instance is usually created by DriveSystemServiceFactory and owned by
   // DriveFileSystem.
   GDataWapiService();
   virtual ~GDataWapiService();
 
   AuthService* auth_service_for_testing();
 
   // DriveServiceInterface Overrides
   virtual void Initialize(Profile* profile) OVERRIDE;
   virtual void AddObserver(DriveServiceObserver* observer) OVERRIDE;
   virtual void RemoveObserver(DriveServiceObserver* observer) OVERRIDE;
-  virtual OperationRegistry* operation_registry() const OVERRIDE;
   virtual bool CanStartOperation() const OVERRIDE;
   virtual void CancelAll() OVERRIDE;
+  virtual bool CancelForFilePath(const FilePath& file_path) OVERRIDE;
+  virtual OperationProgressStatusList GetProgressStatusList() const OVERRIDE;
   virtual void Authenticate(const AuthStatusCallback& callback) OVERRIDE;
   virtual bool HasAccessToken() const OVERRIDE;
   virtual bool HasRefreshToken() const OVERRIDE;
   virtual void GetDocuments(const GURL& feed_url,
                             int64 start_changestamp,
                             const std::string& search_query,
                             const std::string& directory_resource_id,
                             const GetDataCallback& callback) OVERRIDE;
   virtual void GetDocumentEntry(const std::string& resource_id,
                                 const GetDataCallback& callback) OVERRIDE;
@@ skipping 34 matching lines @@
                                const GetDataCallback& callback) OVERRIDE;
   virtual void InitiateUpload(const InitiateUploadParams& params,
                               const InitiateUploadCallback& callback) OVERRIDE;
   virtual void ResumeUpload(const ResumeUploadParams& params,
                             const ResumeUploadCallback& callback) OVERRIDE;
   virtual void AuthorizeApp(const GURL& resource_url,
                             const std::string& app_id,
                             const GetDataCallback& callback) OVERRIDE;
 
  private:
+  OperationRegistry* operation_registry() const;
+
   // AuthService::Observer override.
   virtual void OnOAuth2RefreshTokenChanged() OVERRIDE;
 
+  // DriveServiceObserver Overrides
+  virtual void OnProgressUpdate(
+      const OperationProgressStatusList& list) OVERRIDE;
+  virtual void OnAuthenticationFailed() OVERRIDE;
+
   Profile* profile_;
   scoped_ptr<OperationRunner> runner_;
   ObserverList<DriveServiceObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataWapiService);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_WAPI_SERVICE_H_