Index: chrome/browser/chromeos/drive/drive_file_system_interface.h |
diff --git a/chrome/browser/chromeos/drive/drive_file_system_interface.h b/chrome/browser/chromeos/drive/drive_file_system_interface.h |
index bb6b4bab0db80e8a645ebc13842d622d0a924d87..1f26b3747b1af459d9841a14f6ac631b46cc09db 100644 |
--- a/chrome/browser/chromeos/drive/drive_file_system_interface.h |
+++ b/chrome/browser/chromeos/drive/drive_file_system_interface.h |
@@ -14,8 +14,11 @@ |
#include "chrome/browser/google_apis/gdata_operations.h" |
namespace gdata { |
- |
class DocumentEntry; |
+} |
+ |
+namespace drive { |
+ |
class DriveEntryProto; |
class DriveFileSystemObserver; |
@@ -242,7 +245,7 @@ class DriveFileSystemInterface { |
virtual void GetFileByPath( |
const FilePath& file_path, |
const GetFileCallback& get_file_callback, |
- const GetContentCallback& get_content_callback) = 0; |
+ const gdata::GetContentCallback& get_content_callback) = 0; |
// Gets a file by the given |resource_id| from the Drive server. Used for |
// fetching pinned-but-not-fetched files. |
@@ -254,7 +257,7 @@ class DriveFileSystemInterface { |
virtual void GetFileByResourceId( |
const std::string& resource_id, |
const GetFileCallback& get_file_callback, |
- const GetContentCallback& get_content_callback) = 0; |
+ const gdata::GetContentCallback& get_content_callback) = 0; |
// Updates a file by the given |resource_id| on the Drive server by |
// uploading an updated version. Used for uploading dirty files. The file |
@@ -327,9 +330,9 @@ class DriveFileSystemInterface { |
// and clears the dirty bit in the cache. |
// |
// |callback| will be called on the UI thread upon completion of operation. |
- virtual void AddUploadedFile(UploadMode upload_mode, |
+ virtual void AddUploadedFile(gdata::UploadMode upload_mode, |
const FilePath& directory_path, |
- scoped_ptr<DocumentEntry> doc_entry, |
+ scoped_ptr<gdata::DocumentEntry> doc_entry, |
const FilePath& file_content_path, |
DriveCache::FileOperationType cache_operation, |
const base::Closure& callback) = 0; |
@@ -340,11 +343,11 @@ class DriveFileSystemInterface { |
// |callback| will be called on the UI thread upon completion of operation. |
virtual void UpdateEntryData(const std::string& resource_id, |
const std::string& md5, |
- scoped_ptr<DocumentEntry> entry, |
+ scoped_ptr<gdata::DocumentEntry> entry, |
const FilePath& file_content_path, |
const base::Closure& callback) = 0; |
}; |
-} // namespace gdata |
+} // namespace drive |
#endif // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_INTERFACE_H_ |