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

chrome/browser/chromeos/gdata/drive_api_service.cc

 // 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.
 
 #include "chrome/browser/chromeos/gdata/drive_api_service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 20 matching lines @@
 }  // namespace
 
 DriveAPIService::DriveAPIService()
     : profile_(NULL),
       runner_(NULL) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 DriveAPIService::~DriveAPIService() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (runner_.get())
+  if (runner_.get()) {
+    runner_->operation_registry()->RemoveObserver(this);
     runner_->auth_service()->RemoveObserver(this);
+  }
 }
 
 void DriveAPIService::Initialize(Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   profile_ = profile;
 
   std::vector<std::string> scopes;
   scopes.push_back(kDriveScope);
   scopes.push_back(kDriveAppsReadonlyScope);
   runner_.reset(new OperationRunner(profile, scopes));
   runner_->Initialize();
 
   runner_->auth_service()->AddObserver(this);
+  runner_->operation_registry()->AddObserver(this);
 }
 
 void DriveAPIService::AddObserver(DriveServiceObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void DriveAPIService::RemoveObserver(DriveServiceObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-OperationRegistry* DriveAPIService::operation_registry() const {
-  return runner_->operation_registry();
-}
-
 bool DriveAPIService::CanStartOperation() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   return HasRefreshToken();
 }
 
 void DriveAPIService::CancelAll() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   runner_->CancelAll();
 }
 
+bool DriveAPIService::CancelForFilePath(const FilePath& file_path) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  return operation_registry()->CancelForFilePath(file_path);
+}
+
+OperationProgressStatusList DriveAPIService::GetProgressStatusList() const {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  return operation_registry()->GetProgressStatusList();
+}
+
 void DriveAPIService::Authenticate(const AuthStatusCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   runner_->Authenticate(callback);
 }
 
 void DriveAPIService::GetDocuments(const GURL& url,
                                    int64 start_changestamp,
                                    const std::string& search_query,
                                    const std::string& directory_resource_id,
                                    const GetDataCallback& callback) {
@@ skipping 167 matching lines @@
 
   return runner_->auth_service()->HasAccessToken();
 }
 
 bool DriveAPIService::HasRefreshToken() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   return runner_->auth_service()->HasRefreshToken();
 }
 
+OperationRegistry* DriveAPIService::operation_registry() const {
+  return runner_->operation_registry();
+}
+
 void DriveAPIService::OnOAuth2RefreshTokenChanged() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (CanStartOperation()) {
     FOR_EACH_OBSERVER(
         DriveServiceObserver, observers_, OnReadyToPerformOperations());
   }
 }
 
+void DriveAPIService::OnProgressUpdate(
+    const OperationProgressStatusList& list) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  FOR_EACH_OBSERVER(
+      DriveServiceObserver, observers_, OnProgressUpdate(list));
+}
+
+void DriveAPIService::OnAuthenticationFailed() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  FOR_EACH_OBSERVER(
+      DriveServiceObserver, observers_, OnAuthenticationFailed());
+}
+
 }  // namespace gdata