| Index: chrome/browser/chromeos/drive/resource_metadata.h
|
| diff --git a/chrome/browser/chromeos/drive/resource_metadata.h b/chrome/browser/chromeos/drive/resource_metadata.h
|
| index 07249785fc7f3dddca59e1ffa176b4521de6cd85..3dcc61515f92748e106be66e43ad52372cb2060f 100644
|
| --- a/chrome/browser/chromeos/drive/resource_metadata.h
|
| +++ b/chrome/browser/chromeos/drive/resource_metadata.h
|
| @@ -106,7 +106,7 @@ class ResourceMetadata {
|
| ~ResourceMetadata();
|
|
|
| // Sets up entries which should be present by default.
|
| - bool SetUpDefaultEntries();
|
| + FileError SetUpDefaultEntries();
|
|
|
| // Used to implement Destroy().
|
| void DestroyOnBlockingPool();
|
| @@ -115,13 +115,14 @@ class ResourceMetadata {
|
| // parent if there is. This method will also do name de-duplication to ensure
|
| // that the exposed presentation path does not have naming conflicts. Two
|
| // files with the same name "Foo" will be renamed to "Foo (1)" and "Foo (2)".
|
| - bool PutEntryUnderDirectory(const ResourceEntry& entry);
|
| + FileError PutEntryUnderDirectory(const ResourceEntry& entry);
|
|
|
| // Returns an unused base name for |entry|.
|
| - std::string GetDeduplicatedBaseName(const ResourceEntry& entry);
|
| + FileError GetDeduplicatedBaseName(const ResourceEntry& entry,
|
| + std::string* base_name);
|
|
|
| // Removes the entry and its descendants.
|
| - bool RemoveEntryRecursively(const std::string& id);
|
| + FileError RemoveEntryRecursively(const std::string& id);
|
|
|
| scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
|
|
|
|
|