drive: Add drive/trash

chrome/browser/chromeos/drive/file_system_util.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_UTIL_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_UTIL_H_
 
 #include <string>
 
 #include "base/callback_forward.h"
@@ skipping 18 matching lines @@
 class ResourceEntry;
 
 namespace util {
 
 // "drive" diretory's local ID is fixed to this value.
 const char kDriveGrandRootLocalId[] = "<drive>";
 
 // "drive/other" diretory's local ID is fixed to this value.
 const char kDriveOtherDirLocalId[] = "<other>";
 
+// "drive/trash" diretory's local ID is fixed to this value.
+const char kDriveTrashDirLocalId[] = "<trash>";
+
 // The directory names used for the Google Drive file system tree. These names
 // are used in URLs for the file manager, hence user-visible.
 const base::FilePath::CharType kDriveGrandRootDirName[] =
     FILE_PATH_LITERAL("drive");
 
 const base::FilePath::CharType kDriveMyDriveRootDirName[] =
     FILE_PATH_LITERAL("root");
 
 const base::FilePath::CharType kDriveOtherDirName[] =
     FILE_PATH_LITERAL("other");
 
+const base::FilePath::CharType kDriveTrashDirName[] =
+    FILE_PATH_LITERAL("trash");
+
 // Returns the path of the top root of the pseudo tree.
 const base::FilePath& GetDriveGrandRootPath();
 
 // Returns the path of the directory representing "My Drive".
 const base::FilePath& GetDriveMyDriveRootPath();
 
 // Returns the Drive mount point path, which looks like "/special/drive".
 const base::FilePath& GetDriveMountPointPath();
 
 // Returns the FileSystem for the |profile|. If not available (not mounted
@@ skipping 13 matching lines @@
 // Returns the DriveAppRegistry for the |profile|. If not available (not
 // mounted or disabled), returns NULL.
 DriveAppRegistry* GetDriveAppRegistryByProfile(Profile* profile);
 
 // Returns the DriveService for the |profile|. If not available (not mounted
 // or disabled), returns NULL.
 DriveServiceInterface* GetDriveServiceByProfile(Profile* profile);
 
 // Checks if the resource ID is a special one, which is effective only in our
 // implementation and is not supposed to be sent to the server.
 bool IsSpecialResourceId(const std::string& resource_id);

[kinaba, 2013/11/12 02:10:27]

I guess this functions should handle <trash> as a special ID.

[kinaba, 2013/11/12 02:10:27]

And about "not supposed to be sent to the server",
ChangeListLoader::DoLoadDirectoryFromServer
is filtering directory load request to <other>
Probably we might want to handle <trash> there as well, by using this utility
function.

[hashimoto, 2013/11/12 04:08:13]

We shouldn't handle kDriveTrashDirId with this function because
kDriveTrashDirLocalId is not used as a resource ID. (resource_id of drive/trash
is empty)
Hence there is no chance for <trash> to be handled by ChangeListLoader.

Removed a wrong use of IsSpecialResourceId in ResourceMetadata::RemoveEntry.

 
 // Returns a ResourceEntry for "/drive/root" directory.
 ResourceEntry CreateMyDriveRootEntry(const std::string& root_resource_id);
 
 // Returns the Drive mount path as string.
 const std::string& GetDriveMountPointPathAsString();
 
 // Returns the gdata file resource url formatted as "drive:<path>"
 GURL FilePathToDriveURL(const base::FilePath& path);
 
@@ skipping 100 matching lines @@
 // Reads resource ID from a GDoc file.
 std::string ReadResourceIdFromGDocFile(const base::FilePath& file_path);
 
 // Returns true if Drive is enabled for the given Profile.
 bool IsDriveEnabledForProfile(Profile* profile);
 
 }  // namespace util
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_UTIL_H_