summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-18 04:23:19 +0000
committerwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-18 04:23:19 +0000
commite49bedfb48b19e4440ff8da6d3b193de3d8b9a56 (patch)
tree046ba634cacc12aa3633976b25e4338af9950b90 /remoting
parente530a1d18137d2839aa3bcc6cb6ddf5300fb93ed (diff)
downloadchromium_src-e49bedfb48b19e4440ff8da6d3b193de3d8b9a56.zip
chromium_src-e49bedfb48b19e4440ff8da6d3b193de3d8b9a56.tar.gz
chromium_src-e49bedfb48b19e4440ff8da6d3b193de3d8b9a56.tar.bz2
If getDaemonVersion() fails then log that the host version is not available.
Without this, the web-app if the host plugin cannot be loaded. BUG=128586 Review URL: https://chromiumcodereview.appspot.com/10332234 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137822 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/webapp/host_controller.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/remoting/webapp/host_controller.js b/remoting/webapp/host_controller.js
index c78079c..364e5c2 100644
--- a/remoting/webapp/host_controller.js
+++ b/remoting/webapp/host_controller.js
@@ -24,7 +24,11 @@ remoting.HostController = function() {
console.log('Host version:', version);
}
};
- this.plugin_.getDaemonVersion(printVersion);
+ try {
+ this.plugin_.getDaemonVersion(printVersion);
+ } catch (err) {
+ console.log('Host version not available.');
+ }
};
// Note that the values in the enums below are copied from