diff options
Diffstat (limited to 'chrome/browser/chromeos/extensions')
3 files changed, 10 insertions, 8 deletions
diff --git a/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc b/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc index 10f6d97..edcde56 100644 --- a/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc +++ b/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc @@ -12,11 +12,11 @@ #include "base/scoped_temp_dir.h" #include "base/threading/worker_pool.h" #include "base/values.h" -#include "chrome/common/chrome_paths.h" +#include "chrome/browser/chromeos/gdata/gdata_errorcode.h" #include "chrome/browser/chromeos/gdata/gdata_file_system.h" -#include "chrome/browser/chromeos/gdata/gdata_system_service.h" +#include "chrome/browser/chromeos/gdata/gdata_operation_registry.h" #include "chrome/browser/chromeos/gdata/gdata_parser.h" -#include "chrome/browser/chromeos/gdata/gdata_errorcode.h" +#include "chrome/browser/chromeos/gdata/gdata_system_service.h" #include "chrome/browser/chromeos/gdata/gdata_util.h" #include "chrome/browser/chromeos/gdata/mock_gdata_documents_service.h" #include "chrome/browser/extensions/extension_apitest.h" @@ -24,6 +24,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_notification_types.h" +#include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.cc b/chrome/browser/chromeos/extensions/file_browser_event_router.cc index 1bbf6cc..f70fdac 100644 --- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc +++ b/chrome/browser/chromeos/extensions/file_browser_event_router.cc @@ -12,6 +12,7 @@ #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/extensions/file_browser_notifications.h" #include "chrome/browser/chromeos/extensions/file_manager_util.h" +#include "chrome/browser/chromeos/gdata/gdata_documents_service.h" #include "chrome/browser/chromeos/gdata/gdata_system_service.h" #include "chrome/browser/chromeos/gdata/gdata_util.h" #include "chrome/browser/chromeos/login/base_login_display_host.h" @@ -116,8 +117,7 @@ void FileBrowserEventRouter::ShutdownOnUIThread() { GDataSystemServiceFactory::FindForProfile(profile_); if (system_service) { system_service->file_system()->RemoveObserver(this); - system_service->file_system()->GetOperationRegistry()-> - RemoveObserver(this); + system_service->docs_service()->operation_registry()->RemoveObserver(this); } chromeos::NetworkLibrary* network_library = @@ -147,7 +147,7 @@ void FileBrowserEventRouter::ObserveFileSystemEvents() { NOTREACHED(); return; } - system_service->file_system()->GetOperationRegistry()->AddObserver(this); + system_service->docs_service()->operation_registry()->AddObserver(this); system_service->file_system()->AddObserver(this); chromeos::NetworkLibrary* network_library = diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc index 6f12f34..2df1c52 100644 --- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc +++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc @@ -22,6 +22,7 @@ #include "chrome/browser/chromeos/extensions/file_manager_util.h" #include "chrome/browser/chromeos/gdata/drive_webapps_registry.h" #include "chrome/browser/chromeos/gdata/gdata.pb.h" +#include "chrome/browser/chromeos/gdata/gdata_documents_service.h" #include "chrome/browser/chromeos/gdata/gdata_file_system_proxy.h" #include "chrome/browser/chromeos/gdata/gdata_operation_registry.h" #include "chrome/browser/chromeos/gdata/gdata_system_service.h" @@ -1862,7 +1863,7 @@ ListValue* GetFileTransfersFunction::GetFileTransfersList() { return NULL; std::vector<gdata::GDataOperationRegistry::ProgressStatus> - list = system_service->file_system()->GetOperationRegistry()-> + list = system_service->docs_service()->operation_registry()-> GetProgressStatusList(); return file_manager_util::ProgressStatusVectorToListValue( profile_, source_url_.GetOrigin(), list); @@ -1919,7 +1920,7 @@ void CancelFileTransfersFunction::GetLocalPathsResponseOnUIThread( } gdata::GDataOperationRegistry* operation_registry = - system_service->file_system()->GetOperationRegistry(); + system_service->docs_service()->operation_registry(); scoped_ptr<ListValue> responses(new ListValue()); for (size_t i = 0; i < files.size(); ++i) { |