diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 04:55:52 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 04:55:52 +0000 |
| commit | 67241b83d4bd573d00f1fa6e6056cf25f74ddf49 (patch) | |
| tree | 7613732325f898bcafbb7c9eac0f31e9ce9e5cd9 /chrome/browser/chromeos/drive/sync_client.cc | |
| parent | ce34e101af48b9b576b6cdee5fac7f88a956ec21 (diff) | |
| download | chromium_src-67241b83d4bd573d00f1fa6e6056cf25f74ddf49.zip chromium_src-67241b83d4bd573d00f1fa6e6056cf25f74ddf49.tar.gz chromium_src-67241b83d4bd573d00f1fa6e6056cf25f74ddf49.tar.bz2 | |
Rename drive::DriveEntryProto to drive::ResourceEntry
As part of an effort to remove 'drive' prefix from c/b/chromeos/drive.
BUG=233482
TEST=none
R=kinaba@chromium.org, thestig@chromium.org
Review URL: https://codereview.chromium.org/14616011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/drive/sync_client.cc')
| -rw-r--r-- | chrome/browser/chromeos/drive/sync_client.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/drive/sync_client.cc b/chrome/browser/chromeos/drive/sync_client.cc index 8701deb..9be0cb4 100644 --- a/chrome/browser/chromeos/drive/sync_client.cc +++ b/chrome/browser/chromeos/drive/sync_client.cc @@ -246,10 +246,10 @@ void SyncClient::OnGetEntryInfoByResourceId( const FileCacheEntry& cache_entry, FileError error, const base::FilePath& /* drive_file_path */, - scoped_ptr<DriveEntryProto> entry_proto) { + scoped_ptr<ResourceEntry> entry) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - if (entry_proto.get() && !entry_proto->has_file_specific_info()) + if (entry.get() && !entry->has_file_specific_info()) error = FILE_ERROR_NOT_FOUND; if (error != FILE_ERROR_OK) { @@ -260,7 +260,7 @@ void SyncClient::OnGetEntryInfoByResourceId( // If MD5s don't match, it indicates the local cache file is stale, unless // the file is dirty (the MD5 is "local"). We should never re-fetch the // file when we have a locally modified version. - if (entry_proto->file_specific_info().file_md5() != cache_entry.md5() && + if (entry->file_specific_info().file_md5() != cache_entry.md5() && !cache_entry.is_dirty()) { cache_->Remove(resource_id, base::Bind(&SyncClient::OnRemove, |