gdata: Change callback type of GDataDirectoryService::GetEntryInfoByResourceId()

chrome/browser/chromeos/gdata/gdata_directory_service.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_GDATA_GDATA_DIRECTORY_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_DIRECTORY_SERVICE_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 71 matching lines @@
 // Used to get entry info from the file system.
 // If |error| is not GDATA_FILE_OK, |entry_info| is set to NULL.
 typedef base::Callback<void(GDataFileError error,
                             scoped_ptr<GDataEntryProto> entry_proto)>
     GetEntryInfoCallback;
 
 typedef base::Callback<void(GDataFileError error,
                             scoped_ptr<GDataEntryProtoVector> entries)>
     ReadDirectoryCallback;
 
+// Used to get entry info from the file system, with the Drive file path.
+// If |error| is not GDATA_FILE_OK, |entry_proto| is set to NULL.
+//
+// |drive_file_path| parameter is provided as GDataEntryProto does not contain
+// the Drive file path (i.e. only contains the base name without parent
+// directory names).
+typedef base::Callback<void(GDataFileError error,
+                            const FilePath& drive_file_path,
+                            scoped_ptr<GDataEntryProto> entry_proto)>
+    GetEntryInfoWithFilePathCallback;
+
 // This is a part of EntryInfoPairResult.
 struct EntryInfoResult {
   EntryInfoResult();
   ~EntryInfoResult();
 
   FilePath path;
   GDataFileError error;
   scoped_ptr<GDataEntryProto> proto;
 };
 
@@ skipping 93 matching lines @@
   // Returns the GDataEntry* in the callback with the corresponding
   // |resource_id|. TODO(satorux): Remove this in favor of
   // GetEntryInfoByResourceId(). crbug.com/137512
   void GetEntryByResourceIdAsync(const std::string& resource_id,
                                  const GetEntryByResourceIdCallback& callback);
 
   // Finds an entry (a file or a directory) by |resource_id|.
   //
   // Must be called from UI thread. |callback| is run on UI thread.
   // |callback| must not be null.
-  void GetEntryInfoByResourceId(const std::string& resource_id,
-                                const GetEntryInfoCallback& callback);
+  void GetEntryInfoByResourceId(
+      const std::string& resource_id,
+      const GetEntryInfoWithFilePathCallback& callback);
 
   // Finds an entry (a file or a directory) by |file_path|.
   //
   // Must be called from UI thread. |callback| is run on UI thread.
   // |callback| must not be null.
   void GetEntryInfoByPath(const FilePath& file_path,
                           const GetEntryInfoCallback& callback);
 
   // Finds and reads a directory by |file_path|.
   //
@@ skipping 95 matching lines @@
   // This should remain the last member so it'll be destroyed first and
   // invalidate its weak pointers before other members are destroyed.
   base::WeakPtrFactory<GDataDirectoryService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataDirectoryService);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_DIRECTORY_SERVICE_H_