Video Player: Supports bound arguments of wrap() util function

And with this patch, the error detail is shown in case of error.

BUG=355545
TEST=manually tested
R=hirono@chromium.org

Review URL: https://codereview.chromium.org/315103004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275328 0039d316-1c4b-4281-b951-d872f2087c98

ui/file_manager/video_player/js/error_util.js

@@ -22,19 +22,26 @@ window.onerror = function() { window.JSErrorCount++; };
  *  - Bind this object
  *
  * @param {Object} thisObject Object to be used as this.
+ * @param {...} var_args Arguments to be bound with the wrapped function.
  * @return {function} Wrapped function.
  */
-Function.prototype.wrap = function(thisObject) {
+Function.prototype.wrap = function(thisObject, var_args) {
   var func = this;
   var liveStack = (new Error('Stack trace before async call')).stack;
   if (thisObject === undefined)
     thisObject = null;
+  var boundArguments = Array.prototype.slice.call(arguments, 1);
 
-  return function wrappedCallback() {
+  return function wrappedCallback(var_args) {
     try {
-      return func.apply(thisObject, arguments);
+      var args = boundArguments.concat(Array.prototype.slice.call(arguments));
+      return func.apply(thisObject, args);
     } catch (e) {
-      console.error('Exception happens in callback.', liveStack);
+      // Some async funcrtion doesn't handle exception correctly. So outputing
+      // the exception message and stack trace just in case.
+      // The message will show twice if the caller handles exception correctly.
+      console.error(e.stack);
+      console.info('Exception above happened in callback.', liveStack);
 
       window.JSErrorCount++;
       throw e;

ui/file_manager/video_player/js/video_player.js

@@ -51,7 +51,7 @@ function FullWindowVideoControls(
   this.inactivityWatcher_ = new MouseInactivityWatcher(playerContainer);
   this.__defineGetter__('inactivityWatcher', function() {
     return this.inactivityWatcher_;
-  });
+  }.wrap(this));
 
   this.inactivityWatcher_.check();
 }
@@ -126,11 +126,11 @@ VideoPlayer.prototype = {
  * @param {Array.<Object.<string, Object>>} videos List of videos.
  */
 VideoPlayer.prototype.prepare = function(videos) {
-  document.ondragstart = function(e) { e.preventDefault() };
-
   this.videos_ = videos;
 
-  var preventDefault = function(event) { event.preventDefault(); };
+  var preventDefault = function(event) { event.preventDefault(); }.wrap(null);
+
+  document.ondragstart = preventDefault;
 
   var maximizeButton = document.querySelector('.maximize-button');
   maximizeButton.addEventListener(
@@ -141,7 +141,7 @@ VideoPlayer.prototype.prepare = function(videos) {
         appWindow.restore();
       else
         appWindow.maximize();
-    });
+    }.wrap(null));
   maximizeButton.addEventListener('mousedown', preventDefault);
 
   var minimizeButton = document.querySelector('.minimize-button');
@@ -149,13 +149,13 @@ VideoPlayer.prototype.prepare = function(videos) {
     'click',
     function() {
       chrome.app.window.current().minimize()
-    });
+    }.wrap(null));
   minimizeButton.addEventListener('mousedown', preventDefault);
 
   var closeButton = document.querySelector('.close-button');
   closeButton.addEventListener(
     'click',
-    function() { close(); });
+    function() { close(); }.wrap(null));
   closeButton.addEventListener('mousedown', preventDefault);
 
   this.controls_ = new FullWindowVideoControls(
@@ -302,7 +302,7 @@ function initVideos(callback) {
         var videos = window.videos;
         window.videos = null;
         callback(videos);
-      });
+      }.wrap(null));
 }
 
 var player = new VideoPlayer();
@@ -315,7 +315,7 @@ function initStrings(callback) {
   chrome.fileBrowserPrivate.getStrings(function(strings) {
     loadTimeData.data = strings;
     callback();
-  });
+  }.wrap(null));
 }
 
 var initPromise = Promise.all(
@@ -327,4 +327,4 @@ initPromise.then(function(results) {
   var videos = results[0];
   player.prepare(videos);
   return new Promise(player.playVideo.wrap(player));
-});
+}.wrap(null));