From ccec4adb0558007d00b89da348ff49a10d113e9c Mon Sep 17 00:00:00 2001 From: "kochi@chromium.org" Date: Tue, 23 Oct 2012 18:09:32 +0000 Subject: [PATCH] Rename DirectoryService to ResourceMetadata BUG=none TEST=compiles Review URL: https://chromiumcodereview.appspot.com/11189139 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163602 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/chromeos/drive/drive_feed_loader.cc | 8 ++++---- chrome/browser/chromeos/drive/drive_feed_loader.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/chrome/browser/chromeos/drive/drive_feed_loader.cc b/chrome/browser/chromeos/drive/drive_feed_loader.cc index b256160ffb61c7..a5f99f46dbcd26 100644 --- a/chrome/browser/chromeos/drive/drive_feed_loader.cc +++ b/chrome/browser/chromeos/drive/drive_feed_loader.cc @@ -784,7 +784,7 @@ void DriveFeedLoader::LoadFromCache(bool should_load_from_server, path = path.Append(kResourceMetadataDBFile); resource_metadata_->InitFromDB(path, blocking_task_runner_, base::Bind( - &DriveFeedLoader::ContinueWithInitializedDirectoryService, + &DriveFeedLoader::ContinueWithInitializedResourceMetadata, weak_ptr_factory_.GetWeakPtr(), base::Owned(params))); } else { @@ -817,15 +817,15 @@ void DriveFeedLoader::OnProtoLoaded(LoadRootFeedParams* params) { } } - ContinueWithInitializedDirectoryService(params, params->load_error); + ContinueWithInitializedResourceMetadata(params, params->load_error); } -void DriveFeedLoader::ContinueWithInitializedDirectoryService( +void DriveFeedLoader::ContinueWithInitializedResourceMetadata( LoadRootFeedParams* params, DriveFileError error) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - DVLOG(1) << "Time elapsed to load directory service from disk=" + DVLOG(1) << "Time elapsed to load resource metadata from disk=" << (base::Time::Now() - params->load_start_time).InMilliseconds() << " milliseconds"; diff --git a/chrome/browser/chromeos/drive/drive_feed_loader.h b/chrome/browser/chromeos/drive/drive_feed_loader.h index 5130836379c522..fe4dbc6cb862d7 100644 --- a/chrome/browser/chromeos/drive/drive_feed_loader.h +++ b/chrome/browser/chromeos/drive/drive_feed_loader.h @@ -162,9 +162,9 @@ class DriveFeedLoader { // Callback for handling root directory refresh from the cache. void OnProtoLoaded(LoadRootFeedParams* params); - // Continues handling root directory refresh after the directory service + // Continues handling root directory refresh after the resource metadata // is fully loaded. - void ContinueWithInitializedDirectoryService(LoadRootFeedParams* params, + void ContinueWithInitializedResourceMetadata(LoadRootFeedParams* params, DriveFileError error); // Helper callback for handling results of metadata retrieval initiated from