Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / renderer / resources / extensions / event.js

diff --git a/src/chrome/renderer/resources/extensions/event.js b/src/chrome/renderer/resources/extensions/event.js
index 681b985..74f3ee0 100644 (file)
--- a/src/chrome/renderer/resources/extensions/event.js
+++ b/src/chrome/renderer/resources/extensions/event.js
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
   var eventNatives = requireNative('event_natives');
+  var handleUncaughtException = require('uncaught_exception_handler').handle;
   var logging = requireNative('logging');
   var schemaRegistry = requireNative('schema_registry');
   var sendRequest = require('sendRequest').sendRequest;
@@ -380,10 +381,11 @@
         if (result !== undefined)
           $Array.push(results, result);
       } catch (e) {
-        console.error(
+        handleUncaughtException(
           'Error in event handler for ' +
-          (this.eventName ? this.eventName : '(unknown)') +
-          ': ' + e.message + '\nStack trace: ' + e.stack);
+              (this.eventName ? this.eventName : '(unknown)') +
+              ': ' + e.message + '\nStack trace: ' + e.stack,
+          e);
       }
     }
     if (results.length)
@@ -506,7 +508,7 @@
     }
   });
 
-  var Event = utils.expose('Event', EventImpl, [
+  var Event = utils.expose('Event', EventImpl, { functions: [
     'addListener',
     'removeListener',
     'hasListener',
@@ -516,7 +518,7 @@
     'addRules',
     'removeRules',
     'getRules'
-  ]);
+  ] });
 
   // NOTE: Event is (lazily) exposed as chrome.Event from dispatcher.cc.
   exports.Event = Event;