summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/chromeos/drive/drive_file_system_interface.h7
-rw-r--r--chrome/browser/chromeos/drive/file_system/copy_operation.h2
-rw-r--r--chrome/browser/chromeos/drive/resource_metadata.h7
-rw-r--r--chrome/browser/chromeos/drive/sync_client.h2
-rw-r--r--chrome/browser/ui/webui/screenshot_source.h2
5 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/chromeos/drive/drive_file_system_interface.h b/chrome/browser/chromeos/drive/drive_file_system_interface.h
index 8984115..16e0eb9 100644
--- a/chrome/browser/chromeos/drive/drive_file_system_interface.h
+++ b/chrome/browser/chromeos/drive/drive_file_system_interface.h
@@ -26,6 +26,13 @@ class ResourceMetadata;
typedef std::vector<DriveEntryProto> DriveEntryProtoVector;
+// File type on the drive file system can be either a regular file or
+// a hosted document.
+enum DriveFileType {
+ REGULAR_FILE,
+ HOSTED_DOCUMENT,
+};
+
// Information about search result returned by Search Async callback.
// This is data needed to create a file system entry that will be used by file
// browser.
diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation.h b/chrome/browser/chromeos/drive/file_system/copy_operation.h
index b09a009..e111d0c 100644
--- a/chrome/browser/chromeos/drive/file_system/copy_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/copy_operation.h
@@ -8,7 +8,7 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/drive/resource_metadata.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
#include "chrome/browser/google_apis/gdata_errorcode.h"
class GURL;
diff --git a/chrome/browser/chromeos/drive/resource_metadata.h b/chrome/browser/chromeos/drive/resource_metadata.h
index 4ea7f19..36bfcc6 100644
--- a/chrome/browser/chromeos/drive/resource_metadata.h
+++ b/chrome/browser/chromeos/drive/resource_metadata.h
@@ -60,13 +60,6 @@ class DirectoryFetchInfo {
const int64 changestamp_;
};
-// File type on the drive file system can be either a regular file or
-// a hosted document.
-enum DriveFileType {
- REGULAR_FILE,
- HOSTED_DOCUMENT,
-};
-
// Callback similar to FileOperationCallback but with a given |file_path|.
// Used for operations that change a file path like moving files.
typedef base::Callback<void(FileError error,
diff --git a/chrome/browser/chromeos/drive/sync_client.h b/chrome/browser/chromeos/drive/sync_client.h
index 6a37872..c427af4 100644
--- a/chrome/browser/chromeos/drive/sync_client.h
+++ b/chrome/browser/chromeos/drive/sync_client.h
@@ -12,8 +12,8 @@
#include "base/memory/weak_ptr.h"
#include "base/time.h"
#include "chrome/browser/chromeos/drive/cache_observer.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
#include "chrome/browser/chromeos/drive/file_system_observer.h"
-#include "chrome/browser/chromeos/drive/resource_metadata.h"
namespace drive {
diff --git a/chrome/browser/ui/webui/screenshot_source.h b/chrome/browser/ui/webui/screenshot_source.h
index af95a17..78802d3 100644
--- a/chrome/browser/ui/webui/screenshot_source.h
+++ b/chrome/browser/ui/webui/screenshot_source.h
@@ -15,7 +15,7 @@
#include "content/public/browser/url_data_source.h"
#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/drive/resource_metadata.h"
+#include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/google_apis/gdata_errorcode.h"
#endif