| Index: chrome/browser/chromeos/extensions/file_manager_util.cc
|
| diff --git a/chrome/browser/chromeos/extensions/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager_util.cc
|
| index f765324246952af714af4d6fc06cc3c506051cdf..ba8d554b87a8b24835af248469db458ed342e80c 100644
|
| --- a/chrome/browser/chromeos/extensions/file_manager_util.cc
|
| +++ b/chrome/browser/chromeos/extensions/file_manager_util.cc
|
| @@ -23,7 +23,6 @@
|
| #include "chrome/browser/extensions/crx_installer.h"
|
| #include "chrome/browser/extensions/extension_install_prompt.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| -#include "chrome/browser/google_apis/operation_registry.h"
|
| #include "chrome/browser/plugin_prefs.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| @@ -60,7 +59,6 @@ using content::BrowserThread;
|
| using content::PluginService;
|
| using content::UserMetricsAction;
|
| using file_handler_util::FileTaskExecutor;
|
| -using gdata::OperationRegistry;
|
|
|
| #define FILEBROWSER_EXTENSON_ID "hhaomjibdihmijegdhdafkllkbggdgoj"
|
| const char kFileBrowserDomain[] = FILEBROWSER_EXTENSON_ID;
|
| @@ -183,7 +181,7 @@ std::string GetDialogTypeAsString(
|
| DictionaryValue* ProgessStatusToDictionaryValue(
|
| Profile* profile,
|
| const GURL& origin_url,
|
| - const OperationRegistry::ProgressStatus& status) {
|
| + const gdata::OperationProgressStatus& status) {
|
| scoped_ptr<DictionaryValue> result(new DictionaryValue());
|
| GURL file_url;
|
| if (file_manager_util::ConvertFileToFileSystemUrl(profile,
|
| @@ -195,10 +193,9 @@ DictionaryValue* ProgessStatusToDictionaryValue(
|
| }
|
|
|
| result->SetString("transferState",
|
| - OperationRegistry::OperationTransferStateToString(
|
| - status.transfer_state));
|
| + OperationTransferStateToString(status.transfer_state));
|
| result->SetString("transferType",
|
| - OperationRegistry::OperationTypeToString(status.operation_type));
|
| + OperationTypeToString(status.operation_type));
|
| result->SetInteger("processed", static_cast<int>(status.progress_current));
|
| result->SetInteger("total", static_cast<int>(status.progress_total));
|
| return result.release();
|
| @@ -796,11 +793,9 @@ bool ShouldBeOpenedWithPdfPlugin(Profile* profile, const char* file_extension) {
|
|
|
| ListValue* ProgressStatusVectorToListValue(
|
| Profile* profile, const GURL& origin_url,
|
| - const std::vector<OperationRegistry::ProgressStatus>& list) {
|
| + const gdata::OperationProgressStatusList& list) {
|
| scoped_ptr<ListValue> result_list(new ListValue());
|
| - for (std::vector<
|
| - OperationRegistry::ProgressStatus>::const_iterator iter =
|
| - list.begin();
|
| + for (gdata::OperationProgressStatusList::const_iterator iter = list.begin();
|
| iter != list.end(); ++iter) {
|
| result_list->Append(
|
| ProgessStatusToDictionaryValue(profile, origin_url, *iter));
|
|
|