Skip to content

Commit

Permalink
Rename DirectoryService to ResourceMetadata
Browse files Browse the repository at this point in the history
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
  • Loading branch information
kochi@chromium.org committed Oct 23, 2012
1 parent fe81ba4 commit ccec4ad
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions chrome/browser/chromeos/drive/drive_feed_loader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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";

Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/chromeos/drive/drive_feed_loader.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ccec4ad

Please sign in to comment.