Better resume for Video Player.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview MediaControls class implements media playback controls
  * that exist outside of the audio/video HTML element.
  */
 
 /**
@@ skipping 684 matching lines @@
 
   this.resumePositions_ = new TimeLimitedMap(
       'VideoResumePosition',
       VideoControls.RESUME_POSITIONS_CAPACITY,
       VideoControls.RESUME_POSITION_LIFETIME);
 }
 
 VideoControls.RESUME_POSITIONS_CAPACITY = 100;
 VideoControls.RESUME_POSITION_LIFETIME = 30 * 24 * 60 * 60 * 1000;  // 30 days.
 VideoControls.RESUME_MARGIN = 0.03;
-// Ignore the tail margin for videos shorter than 5 minutes.
-VideoControls.RESUME_TAIL_MARGIN_THRESHOLD = 5 * 60;
+VideoControls.RESUME_THRESHOLD = 5 * 60; // No resume for videos < 5 min.
 VideoControls.RESUME_REWIND = 5;  // Rewind 5 seconds back when resuming.
 
 VideoControls.prototype = { __proto__: MediaControls.prototype };
 
 VideoControls.prototype.onMediaComplete = function() {
   this.onMediaPlay_(false);  // Just update the UI.
   this.savePosition();  // This will effectively forget the position.
 };
 
 VideoControls.prototype.togglePlayStateWithFeedback = function(e) {
@@ skipping 28 matching lines @@
     delay(function(){
       self.stateIcon_.setAttribute(
           'state', self.isPlaying() ? 'play' : 'pause');
       delay(hideStatusIcon, 1000);  /* Twice the animation duration. */
     });
   });
 };
 
 VideoControls.prototype.onMediaDuration_ = function() {
   MediaControls.prototype.onMediaDuration_.apply(this, arguments);
-  if (this.media_.duration && this.media_.seekable) {
+  if (this.media_.duration &&
+      this.media_.duration >= VideoControls.RESUME_THRESHOLD &&
+      this.media_.seekable) {
     var position = this.resumePositions_.getValue(this.media_.src);
     if (position) {
       this.media_.currentTime = position;
     }
   }
 };
 
 VideoControls.prototype.togglePlayState = function(e) {
   if (this.isPlaying()) {
     // User gave the Pause command.
     this.savePosition();
   }
   MediaControls.prototype.togglePlayState.apply(this, arguments);
 };
 
 VideoControls.prototype.savePosition = function() {
-  if (!this.media_.duration)
+  if (!this.media_.duration ||
+      this.media_.duration_ < VideoControls.RESUME_THRESHOLD)
     return;
 
   var ratio = this.media_.currentTime / this.media_.duration;
   if (ratio < VideoControls.RESUME_MARGIN ||
-      (this.media_.duration >= VideoControls.RESUME_TAIL_MARGIN_THRESHOLD &&
-      ratio > (1 - VideoControls.RESUME_MARGIN))) {
+      ratio > (1 - VideoControls.RESUME_MARGIN)) {
     // We are too close to the beginning or the end.
     // Remove the resume position so that next time we start from the beginning.
     this.resumePositions_.removeValue(this.media_.src);
   } else {
     this.resumePositions_.setValue(this.media_.src, Math.floor(Math.max(0,
         this.media_.currentTime - VideoControls.RESUME_REWIND)));
   }
 };
 
 /**
@@ skipping 133 matching lines @@
 AudioControls.prototype.onAdvanceClick_ = function(forward) {
   if (!forward &&
       (this.getMedia().currentTime > AudioControls.TRACK_RESTART_THRESHOLD)) {
     // We are far enough from the beginning of the current track.
     // Restart it instead of than skipping to the previous one.
     this.getMedia().currentTime = 0;
   } else {
     this.advanceTrack_(forward);
   }
 };