Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Unified Diff: chrome/browser/chromeos/gdata/gdata_file_system.cc

Issue 10538071: gdata: Convert FindEntryByResourceIdSync() to asynchronous. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase svn:trunk/src@141679 and resolve conflicts. Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/gdata/gdata_file_system.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_file_system.cc b/chrome/browser/chromeos/gdata/gdata_file_system.cc
index 2932ec083fb97358c9c4a4648bf74e32dda854a5..ea62ae804e2908ac49edcd7a42b96ca5e7bd9d45 100644
--- a/chrome/browser/chromeos/gdata/gdata_file_system.cc
+++ b/chrome/browser/chromeos/gdata/gdata_file_system.cc
@@ -832,6 +832,14 @@ CallbackType CreateRelayCallback(const CallbackType& callback) {
callback);
}
+// Callback used to find a directory element for file system updates.
+void ReadOnlyFindEntryCallback(GDataEntry** out,
+ base::PlatformFileError error,
+ GDataEntry* entry) {
+ if (error == base::PLATFORM_FILE_OK)
+ *out = entry;
+}
+
} // namespace
// GDataFileSystem::GetDocumentsParams struct implementation.
@@ -1048,11 +1056,23 @@ void GDataFileSystem::Authenticate(const AuthStatusCallback& callback) {
documents_service_->Authenticate(callback);
}
-void GDataFileSystem::FindEntryByResourceIdSync(
+void GDataFileSystem::FindEntryByResourceId(const std::string& resource_id,
+ const FindEntryCallback& callback) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
+ BrowserThread::CurrentlyOn(BrowserThread::IO));
+ RunTaskOnUIThread(
+ base::Bind(&GDataFileSystem::FindEntryByResourceIdOnUIThread,
+ ui_weak_ptr_,
+ resource_id,
+ CreateRelayCallback(callback)));
+}
+
+void GDataFileSystem::FindEntryByResourceIdOnUIThread(
const std::string& resource_id,
const FindEntryCallback& callback) {
- base::AutoLock lock(lock_); // To access root.
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ base::AutoLock lock(lock_); // To access root.
GDataFile* file = NULL;
GDataEntry* entry = root_->GetEntryByResourceId(resource_id);
if (entry)
« no previous file with comments | « chrome/browser/chromeos/gdata/gdata_file_system.h ('k') | chrome/browser/chromeos/gdata/gdata_file_system_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698