diff options
| author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 22:19:41 +0000 |
|---|---|---|
| committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 22:19:41 +0000 |
| commit | c8ce37e39e89bdef3bbe2f4b69ae7e668815b3b0 (patch) | |
| tree | 5d0a7b897f4565e35b5b2b08b26f86442aad9eb2 /chrome/browser/chromeos/extensions | |
| parent | 61d13c4a3ac5aac639fd36a1cb6ccb5971046425 (diff) | |
| download | chromium_src-c8ce37e39e89bdef3bbe2f4b69ae7e668815b3b0.zip chromium_src-c8ce37e39e89bdef3bbe2f4b69ae7e668815b3b0.tar.gz chromium_src-c8ce37e39e89bdef3bbe2f4b69ae7e668815b3b0.tar.bz2 | |
Merge 144878 - gdata: Get rid of GDataFileSystem::GetCacheState()
Instead, add GDataCache::GetCacheEntryOnUIThread().
BUG=133552
TEST=the existing testis covered this functionality
Review URL: https://chromiumcodereview.appspot.com/10690028
TBR=satorux@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10698158
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@146223 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/extensions')
| -rw-r--r-- | chrome/browser/chromeos/extensions/file_browser_private_api.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/chromeos/extensions/file_browser_private_api.h | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc index e4ae2c8..40bc3c7 100644 --- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc +++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc @@ -1667,7 +1667,7 @@ void GetGDataFilePropertiesFunction::OnOperationComplete( } } - system_service->file_system()->GetCacheState( + system_service->cache()->GetCacheEntryOnUIThread( file_proto->gdata_entry().resource_id(), file_proto->file_md5(), base::Bind( @@ -1677,8 +1677,10 @@ void GetGDataFilePropertiesFunction::OnOperationComplete( void GetGDataFilePropertiesFunction::CacheStateReceived( base::DictionaryValue* property_dict, - base::PlatformFileError error, - int cache_state) { + bool success, + const gdata::GDataCache::CacheEntry& cache_entry) { + const int cache_state = (success ? cache_entry.cache_state : + gdata::GDataCache::CACHE_STATE_NONE); property_dict->SetBoolean( "isPinned", gdata::GDataCache::IsCachePinned(cache_state)); diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.h b/chrome/browser/chromeos/extensions/file_browser_private_api.h index d11f52f..1a897fd 100644 --- a/chrome/browser/chromeos/extensions/file_browser_private_api.h +++ b/chrome/browser/chromeos/extensions/file_browser_private_api.h @@ -14,6 +14,7 @@ #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" #include "chrome/browser/chromeos/extensions/file_browser_event_router.h" +#include "chrome/browser/chromeos/gdata/gdata_cache.h" #include "chrome/browser/extensions/extension_function.h" #include "chrome/browser/prefs/pref_service.h" #include "googleurl/src/url_util.h" @@ -437,8 +438,8 @@ class GetGDataFilePropertiesFunction : public FileBrowserFunction { scoped_ptr<gdata::GDataFileProto> file_proto); void CacheStateReceived(base::DictionaryValue* property_dict, - base::PlatformFileError error, - int cache_state); + bool success, + const gdata::GDataCache::CacheEntry& cache_entry); size_t current_index_; base::ListValue* path_list_; |