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

Unified Diff: ui/file_manager/gallery/js/gallery_data_model.js

Issue 976713004: Add thumbnailMetadataItem to GalleryItem. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. 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/gallery/js/gallery_data_model.js
diff --git a/ui/file_manager/gallery/js/gallery_data_model.js b/ui/file_manager/gallery/js/gallery_data_model.js
index 0fa54b5efe4a6b131e247e9762dd34cbdacfe46e..cac6d65a9a791d2337beabaf8ae3520282e2e45d 100644
--- a/ui/file_manager/gallery/js/gallery_data_model.js
+++ b/ui/file_manager/gallery/js/gallery_data_model.js
@@ -5,23 +5,15 @@
/**
* Data model for gallery.
*
- * @param {!MetadataCache} metadataCache Metadata cache.
* @param {!MetadataModel} metadataModel
* @param {!EntryListWatcher=} opt_watcher Entry list watcher.
* @constructor
* @extends {cr.ui.ArrayDataModel}
*/
-function GalleryDataModel(metadataCache, metadataModel, opt_watcher) {
+function GalleryDataModel(metadataModel, opt_watcher) {
cr.ui.ArrayDataModel.call(this, []);
/**
- * Metadata cache.
- * @private {!MetadataCache}
- * @const
- */
- this.metadataCache_ = metadataCache;
-
- /**
* File system metadata.
* @private {!MetadataModel}
* @const
@@ -72,12 +64,13 @@ GalleryDataModel.prototype = {
GalleryDataModel.prototype.saveItem = function(
volumeManager, item, canvas, overwrite) {
var oldEntry = item.getEntry();
- var oldMetadata = item.getMetadata();
var oldMetadataItem = item.getMetadataItem();
+ var oldThumbnailMetadataItem = item.getThumbnailMetadataItem();
var oldLocationInfo = item.getLocationInfo();
return new Promise(function(fulfill, reject) {
item.saveToFile(
volumeManager,
+ this.metadataModel_,
this.fallbackSaveDirectory,
overwrite,
canvas,
@@ -92,7 +85,7 @@ GalleryDataModel.prototype.saveItem = function(
var event = new Event('content');
event.item = item;
event.oldEntry = oldEntry;
- event.metadata = item.getMetadata();
+ event.thumbnailChanged = true;
this.dispatchEvent(event);
if (!util.isSameEntry(oldEntry, item.getEntry())) {
@@ -101,10 +94,8 @@ GalleryDataModel.prototype.saveItem = function(
var anotherItem = new Gallery.Item(
oldEntry,
oldLocationInfo,
- oldMetadata,
oldMetadataItem,
- this.metadataCache_,
- this.metadataModel_,
+ oldThumbnailMetadataItem,
item.isOriginal());
// The item must be added behind the existing item so that it does
// not change the index of the existing item.

Powered by Google App Engine
This is Rietveld 408576698