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

Unified Diff: ui/file_manager/file_manager/foreground/js/directory_contents.js

Issue 971723002: Files.app: Rename FileSystemMetadata with MetadataModel. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed. Created 5 years, 10 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: ui/file_manager/file_manager/foreground/js/directory_contents.js
diff --git a/ui/file_manager/file_manager/foreground/js/directory_contents.js b/ui/file_manager/file_manager/foreground/js/directory_contents.js
index 9fbab1860bada90f317eaf9a95dd6c1ff0aaac94..d04a46ad924282bd243b551654bc91fe819ab5c7 100644
--- a/ui/file_manager/file_manager/foreground/js/directory_contents.js
+++ b/ui/file_manager/file_manager/foreground/js/directory_contents.js
@@ -393,18 +393,18 @@ FileFilter.prototype.filter = function(entry) {
/**
* File list.
- * @param {!FileSystemMetadata} fileSystemMetadata
+ * @param {!MetadataModel} metadataModel
* @constructor
* @extends {cr.ui.ArrayDataModel}
*/
-function FileListModel(fileSystemMetadata) {
+function FileListModel(metadataModel) {
cr.ui.ArrayDataModel.call(this, []);
/**
- * @private {!FileSystemMetadata}
+ * @private {!MetadataModel}
* @const
*/
- this.fileSystemMetadata_ = fileSystemMetadata;
+ this.metadataModel_ = metadataModel;
// Initialize compare functions.
this.setCompareFunction('name',
@@ -483,7 +483,7 @@ FileListModel.prototype.compareMtime_ = function(a, b) {
return a.isDirectory === this.isDescendingOrder_ ? 1 : -1;
var properties =
- this.fileSystemMetadata_.getCache([a, b], ['modificationTime']);
+ this.metadataModel_.getCache([a, b], ['modificationTime']);
var aTime = properties[0].modificationTime || 0;
var bTime = properties[1].modificationTime || 0;
@@ -508,7 +508,7 @@ FileListModel.prototype.compareSize_ = function(a, b) {
if (a.isDirectory !== b.isDirectory)
return a.isDirectory === this.isDescendingOrder_ ? 1 : -1;
- var properties = this.fileSystemMetadata_.getCache([a, b], ['size']);
+ var properties = this.metadataModel_.getCache([a, b], ['size']);
var aSize = properties[0].size || 0;
var bSize = properties[1].size || 0;
@@ -539,20 +539,20 @@ FileListModel.prototype.compareType_ = function(a, b) {
* TODO(yoshiki): remove this. crbug.com/224869.
*
* @param {FileFilter} fileFilter The file-filter context.
- * @param {!FileSystemMetadata} fileSystemMetadata
+ * @param {!MetadataModel} metadataModel
* @constructor
*/
-function FileListContext(fileFilter, fileSystemMetadata) {
+function FileListContext(fileFilter, metadataModel) {
/**
* @type {FileListModel}
*/
- this.fileList = new FileListModel(fileSystemMetadata);
+ this.fileList = new FileListModel(metadataModel);
/**
- * @public {!FileSystemMetadata}
+ * @public {!MetadataModel}
* @const
*/
- this.fileSystemMetadata = fileSystemMetadata;
+ this.metadataModel = metadataModel;
/**
* @type {FileFilter}
@@ -656,7 +656,7 @@ DirectoryContents.prototype.setFileList = function(fileList) {
DirectoryContents.prototype.createMetadataSnapshot = function() {
var snapshot = {};
var entries = /** @type {!Array<!Entry>} */ (this.fileList_.slice());
- var metadata = this.context_.fileSystemMetadata.getCache(
+ var metadata = this.context_.metadataModel.getCache(
entries, ['modificationTime']);
for (var i = 0; i < entries.length; i++) {
snapshot[entries[i].toURL()] = metadata[i];
@@ -693,7 +693,7 @@ DirectoryContents.prototype.replaceContextFileList = function() {
if (this.metadataSnapshot_) {
var updatedIndexes = [];
var entries = /** @type {!Array<!Entry>} */ (this.fileList_.slice());
- var newMetadatas = this.context_.fileSystemMetadata.getCache(
+ var newMetadatas = this.context_.metadataModel.getCache(
entries, ['modificationTime']);
for (var i = 0; i < entries.length; i++) {
@@ -810,7 +810,7 @@ DirectoryContents.prototype.update = function(updatedEntries, removedUrls) {
}
if (removedUrls.length > 0)
- this.context_.fileSystemMetadata.notifyEntriesRemoved(removedUrls);
+ this.context_.metadataModel.notifyEntriesRemoved(removedUrls);
this.prefetchMetadata(updatedList, true, function() {
this.onNewEntries_(true, addedList);
@@ -975,8 +975,8 @@ DirectoryContents.prototype.onNewEntries_ = function(refresh, entries) {
DirectoryContents.prototype.prefetchMetadata =
function(entries, refresh, callback) {
if (refresh)
- this.context_.fileSystemMetadata.notifyEntriesChanged(entries);
- this.context_.fileSystemMetadata.get(
+ this.context_.metadataModel.notifyEntriesChanged(entries);
+ this.context_.metadataModel.get(
entries, this.context_.prefetchPropertyNames).then(callback);
};

Powered by Google App Engine
This is Rietveld 408576698