| Index: remoting/webapp/app_remoting/js/app_remoting.js
|
| diff --git a/remoting/webapp/app_remoting/js/app_remoting.js b/remoting/webapp/app_remoting/js/app_remoting.js
|
| index 46a0555461c99d09e03f15d1ea16a0e54406e6ff..a92711db8c40a01a992e7d35a3ba88ba632b284d 100644
|
| --- a/remoting/webapp/app_remoting/js/app_remoting.js
|
| +++ b/remoting/webapp/app_remoting/js/app_remoting.js
|
| @@ -288,7 +288,7 @@ remoting.AppRemoting.prototype.handleExtensionMessage = function(
|
| case 'openURL':
|
| // URL requests from the hosted app are untrusted, so disallow anything
|
| // other than HTTP or HTTPS.
|
| - var url = getStringAttr(message, 'url');
|
| + var url = base.getStringAttr(message, 'url');
|
| if (url.indexOf('http:') != 0 && url.indexOf('https:') != 0) {
|
| console.error('Bad URL: ' + url);
|
| } else {
|
| @@ -297,13 +297,13 @@ remoting.AppRemoting.prototype.handleExtensionMessage = function(
|
| return true;
|
|
|
| case 'onWindowRemoved':
|
| - var id = getNumberAttr(message, 'id');
|
| + var id = base.getNumberAttr(message, 'id');
|
| this.windowActivationMenu_.remove(id);
|
| return true;
|
|
|
| case 'onWindowAdded':
|
| - var id = getNumberAttr(message, 'id');
|
| - var title = getStringAttr(message, 'title');
|
| + var id = base.getNumberAttr(message, 'id');
|
| + var title = base.getStringAttr(message, 'title');
|
| this.windowActivationMenu_.add(id, title);
|
| return true;
|
|
|
| @@ -312,15 +312,15 @@ remoting.AppRemoting.prototype.handleExtensionMessage = function(
|
| return true;
|
|
|
| case 'setKeyboardLayouts':
|
| - var supportedLayouts = getArrayAttr(message, 'supportedLayouts');
|
| - var currentLayout = getStringAttr(message, 'currentLayout');
|
| + var supportedLayouts = base.getArrayAttr(message, 'supportedLayouts');
|
| + var currentLayout = base.getStringAttr(message, 'currentLayout');
|
| console.log('Current host keyboard layout: ' + currentLayout);
|
| console.log('Supported host keyboard layouts: ' + supportedLayouts);
|
| this.keyboardLayoutsMenu_.setLayouts(supportedLayouts, currentLayout);
|
| return true;
|
|
|
| case 'pingResponse':
|
| - var then = getNumberAttr(message, 'timestamp');
|
| + var then = base.getNumberAttr(message, 'timestamp');
|
| var now = new Date().getTime();
|
| this.contextMenu_.updateConnectionRTT(now - then);
|
| return true;
|
|
|