| Index: chrome/browser/chromeos/extensions/file_browser_private_api.cc
|
| diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
|
| index a9bb6882d6e094b2b87890fc1ef37d86853f0e33..a3b8c6b366736010a91fbff81b3530c5c9ce60b8 100644
|
| --- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc
|
| +++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
|
| @@ -34,7 +34,6 @@
|
| #include "chrome/browser/extensions/process_map.h"
|
| #include "chrome/browser/google_apis/gdata_util.h"
|
| #include "chrome/browser/google_apis/gdata_wapi_parser.h"
|
| -#include "chrome/browser/google_apis/operation_registry.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/browser_window.h"
|
| @@ -72,7 +71,6 @@ using content::WebContents;
|
| using extensions::Extension;
|
| using file_handler_util::FileTaskExecutor;
|
| using gdata::InstalledApp;
|
| -using gdata::OperationRegistry;
|
|
|
| namespace {
|
|
|
| @@ -2286,9 +2284,8 @@ ListValue* GetFileTransfersFunction::GetFileTransfersList() {
|
| if (!system_service)
|
| return NULL;
|
|
|
| - std::vector<gdata::OperationRegistry::ProgressStatus>
|
| - list = system_service->drive_service()->operation_registry()->
|
| - GetProgressStatusList();
|
| + gdata::OperationProgressStatusList list =
|
| + system_service->drive_service()->GetProgressStatusList();
|
| return file_manager_util::ProgressStatusVectorToListValue(
|
| profile_, source_url_.GetOrigin(), list);
|
| }
|
| @@ -2343,9 +2340,6 @@ void CancelFileTransfersFunction::GetLocalPathsResponseOnUIThread(
|
| return;
|
| }
|
|
|
| - gdata::OperationRegistry* operation_registry =
|
| - system_service->drive_service()->operation_registry();
|
| -
|
| scoped_ptr<ListValue> responses(new ListValue());
|
| for (size_t i = 0; i < files.size(); ++i) {
|
| DCHECK(gdata::util::IsUnderDriveMountPoint(files[i].file_path));
|
| @@ -2353,7 +2347,7 @@ void CancelFileTransfersFunction::GetLocalPathsResponseOnUIThread(
|
| scoped_ptr<DictionaryValue> result(new DictionaryValue());
|
| result->SetBoolean(
|
| "canceled",
|
| - operation_registry->CancelForFilePath(file_path));
|
| + system_service->drive_service()->CancelForFilePath(file_path));
|
| GURL file_url;
|
| if (file_manager_util::ConvertFileToFileSystemUrl(profile_,
|
| gdata::util::GetSpecialRemoteRootPath().Append(file_path),
|
|
|