Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / resources / uber / uber.js

diff --git a/src/chrome/browser/resources/uber/uber.js b/src/chrome/browser/resources/uber/uber.js
index 488310f..a2cbfbd 100644 (file)
--- a/src/chrome/browser/resources/uber/uber.js
+++ b/src/chrome/browser/resources/uber/uber.js
@@ -149,6 +149,7 @@ cr.define('uber', function() {
    * @param {Event} e The posted object.
    */
   function handleWindowMessage(e) {
+    e = /** @type{!MessageEvent.<!{method: string, params: *}>} */(e);
     if (e.data.method === 'beginInterceptingEvents') {
       backgroundNavigation();
     } else if (e.data.method === 'stopInterceptingEvents') {
@@ -167,9 +168,9 @@ cr.define('uber', function() {
     } else if (e.data.method === 'navigationControlsLoaded') {
       onNavigationControlsLoaded();
     } else if (e.data.method === 'adjustToScroll') {
-      adjustToScroll(e.data.params);
+      adjustToScroll(/** @type {number} */(e.data.params));
     } else if (e.data.method === 'mouseWheel') {
-      forwardMouseWheel(e.data.params);
+      forwardMouseWheel(/** @type {Object} */(e.data.params));
     } else {
       console.error('Received unexpected message', e.data);
     }
@@ -203,20 +204,21 @@ cr.define('uber', function() {
 
     if (isRTL()) {
       uber.invokeMethodOnWindow(navFrame.firstChild.contentWindow,
-                                'setContentChanging',
-                                enabled);
+                                'setContentChanging', enabled);
     }
   }
 
   /**
    * Get an iframe based on the origin of a received post message.
    * @param {string} origin The origin of a post message.
-   * @return {!HTMLElement} The frame associated to |origin| or null.
+   * @return {!Element} The frame associated to |origin| or null.
    */
   function getIframeFromOrigin(origin) {
     assert(origin.substr(-1) != '/', 'invalid origin given');
     var query = '.iframe-container > iframe[src^="' + origin + '/"]';
-    return document.querySelector(query);
+    var element = document.querySelector(query);
+    assert(element);
+    return /** @type {!Element} */(element);
   }
 
   /**
@@ -313,7 +315,7 @@ cr.define('uber', function() {
   /**
    * Selects and navigates a subpage. This is called from uber-frame.
    * @param {string} pageId Should match an id of one of the iframe containers.
-   * @param {integer} historyOption Indicates whether we should push or replace
+   * @param {number} historyOption Indicates whether we should push or replace
    *     browser history.
    * @param {string} path A sub-page path.
    */
@@ -371,8 +373,11 @@ cr.define('uber', function() {
 
     if (container.dataset.title)
       document.title = container.dataset.title;
-    $('favicon').href = 'chrome://theme/' + container.dataset.favicon;
-    $('favicon2x').href = 'chrome://theme/' + container.dataset.favicon + '@2x';
+    assert('favicon' in container.dataset);
+
+    var dataset = /** @type {{favicon: string}} */(container.dataset);
+    $('favicon').href = 'chrome://theme/' + dataset.favicon;
+    $('favicon2x').href = 'chrome://theme/' + dataset.favicon + '@2x';
 
     updateNavigationControls();
   }