Add UMA metrics to Photo Editor

chrome/browser/resources/file_manager/js/image_editor/gallery.js

Index: chrome/browser/resources/file_manager/js/image_editor/gallery.js
diff --git a/chrome/browser/resources/file_manager/js/image_editor/gallery.js b/chrome/browser/resources/file_manager/js/image_editor/gallery.js
index 7a7e21945a89aa98212a1e21cbae9e8532b9c9cd..dc7a1a8949ef15b718d65bbb27709a60d5f6c865 100644
--- a/chrome/browser/resources/file_manager/js/image_editor/gallery.js
+++ b/chrome/browser/resources/file_manager/js/image_editor/gallery.js
@@ -225,18 +225,16 @@ Gallery.prototype.load = function(parentDirEntry, items, selectedItem) {
   var selectedURL = urls[selectedIndex];
   // Initialize the ribbon only after the selected image is fully loaded.
   this.metadataProvider_.fetch(selectedURL, function (metadata) {
-    // The first change is load, we should not count it.
-    self.imageChanges_ = -1;
-    self.filenameEdit_.value = ImageUtil.getFileNameFromUrl(selectedURL);
-    self.editor_.openSession(
-        selectedIndex, selectedURL, metadata, 0, initRibbon);
+    self.openImage(selectedIndex, selectedURL, metadata, 0, initRibbon);
   });
 };
 
 Gallery.prototype.onImageContentChanged_ = function() {
   this.imageChanges_++;
-  if (this.imageChanges_ == 1)
+  if (this.imageChanges_ == 1) {  // First edit
     this.ribbon_.getSelectedItem().setCopyName();
+    ImageUtil.metrics.recordUserAction(ImageUtil.getMetricName('Edit'));
+  }
   this.updateFilename_();
 };
 
@@ -344,11 +342,44 @@ Gallery.prototype.prefetchImage = function(id, content, metadata) {
   this.editor_.prefetchImage(id, content, metadata);
 };
 
+// Used for metrics reporting, keep in sync with the histogram description.
+Gallery.FILE_TYPES = ['jpg', 'png', 'gif', 'bmp', 'webp'];

[dgozman, 2011/12/06 15:45:56]

Move to ImageUtil near metric names?

[Vladislav Kaznacheev, 2011/12/06 16:07:44]

Done.

+
 Gallery.prototype.openImage = function(id, content, metadata, slide, callback) {
   // The first change is load, we should not count it.
   this.imageChanges_ = -1;
-  this.updateFilename_();
-  this.editor_.openSession(id, content, metadata, slide, callback);
+
+  var item = this.ribbon_.getSelectedItem();
+  if (item) {
+    this.updateFilename_();
+  } else {
+    this.filenameEdit_.value = ImageUtil.getFileNameFromUrl(content);
+  }
+
+  var self = this;
+  function loadDone() {
+    ImageUtil.metrics.recordUserAction(ImageUtil.getMetricName('View'));
+
+    function toMillions(number) { return Math.round(number / (1000 * 1000)) }
+
+    ImageUtil.metrics.recordSmallCount(ImageUtil.getMetricName('Size.MB'),
+        toMillions(metadata.fileSize));
+
+    var canvas = self.imageView_.getCanvas();
+    ImageUtil.metrics.recordSmallCount(ImageUtil.getMetricName('Size.MPix'),
+        toMillions(canvas.width * canvas.height));
+
+    var url = item ? item.getUrl() : content;
+    var extIndex = url.lastIndexOf('.');
+    var ext = extIndex < 0 ? '' : url.substr(extIndex + 1).toLowerCase();
+    if (ext == 'jpeg') ext = 'jpg';
+    ImageUtil.metrics.recordEnum(
+        ImageUtil.getMetricName('FileType'), ext, Gallery.FILE_TYPES);
+
+    callback(arguments);
+  }
+
+  this.editor_.openSession(id, content, metadata, slide, loadDone);
 };
 
 Gallery.prototype.closeImage = function(item) {
@@ -592,10 +623,11 @@ Ribbon.prototype.select = function(index, opt_forceStep, opt_callback) {
      if (!selectedItem.isSelected()) return;
      self.client_.openImage(
          selectedItem.getIndex(), selectedItem.getContent(), metadata, step,
-         function(loadedInstantly) {
+         function(loadType) {
            if (!selectedItem.isSelected()) return;
            if (Math.abs(step) != 1) return;
-           if (loadedInstantly || (self.sequenceLength_ >= 3)) {
+           if ((loadType == ImageView.LOAD_TYPE_CACHED_FULL) ||
+               (self.sequenceLength_ >= 3)) {
              // We can always afford to prefetch if the previous load was
              // instant. Even if it was not we should start prefetching
              // if we have been going in the same direction for long enough.
@@ -798,6 +830,9 @@ Ribbon.Item.prototype.updateThumbnail = function(canvas) {
 
 Ribbon.Item.prototype.save = function(
     dirEntry, metadataProvider, canvas, opt_callback) {
+
+  ImageUtil.metrics.startInterval(ImageUtil.getMetricName('SaveTime'));

[dgozman, 2011/12/06 15:45:56]

Is it ok to not call recordInterval in the case of error?

[Vladislav Kaznacheev, 2011/12/06 16:07:44]

Absolutely. The interval start time will stay in the internal map and will be
overwritten in the next startInterval call with the same name, no harm done.

On 2011/12/06 15:45:56, dgozman wrote:

+
   var metadataEncoder =
       ImageEncoder.encodeMetadata(this.getMetadata(), canvas, 1);
 
@@ -924,7 +959,7 @@ Ribbon.Item.prototype.getMetadata = function () {
 
 Ribbon.Item.prototype.fetchMetadata = function (metadataProvider, callback) {
   if (this.metadata_) {
-    setTimeout(callback.bind(null, this.metadata_), 0);
+    callback(this.metadata_);  // Every millisecond counts, call directly
   } else {
     metadataProvider.fetch(this.getUrl(), callback);
   }
@@ -934,6 +969,8 @@ Ribbon.Item.prototype.onSaveSuccess = function(url) {
   this.url_ = url;
   delete this.backupMetadata_;
   delete this.canvas_;
+  ImageUtil.metrics.recordEnum(ImageUtil.getMetricName('Save'), 1, 2);
+  ImageUtil.metrics.recordInterval(ImageUtil.getMetricName('SaveTime'));
 };
 
 Ribbon.Item.prototype.onSaveError = function(error) {
@@ -943,6 +980,7 @@ Ribbon.Item.prototype.onSaveError = function(error) {
   this.setMetadata(this.backupMetadata_);
   delete this.backupMetadata_;
   delete this.canvas_;
+  ImageUtil.metrics.recordEnum(ImageUtil.getMetricName('Save'), 0, 2);
 };
 
 Ribbon.MAX_THUMBNAIL_PIXEL_COUNT = 1 << 21; // 2 MPix