diff options
| author | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-15 18:32:03 +0000 |
|---|---|---|
| committer | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-15 18:32:03 +0000 |
| commit | eecd1253ee681af7d91346a03b09901ef653e688 (patch) | |
| tree | 433b5b92524f7a698c5a0770fde4df4ac58a4652 /remoting/webapp | |
| parent | a653a2983c8b8e679a95f4c632bfda464afd7511 (diff) | |
| download | chromium_src-eecd1253ee681af7d91346a03b09901ef653e688.zip chromium_src-eecd1253ee681af7d91346a03b09901ef653e688.tar.gz chromium_src-eecd1253ee681af7d91346a03b09901ef653e688.tar.bz2 | |
Handle exception from getDaemonVersion on NPAPI plugin.
This exception-handling was mistakenly removed in r199035.
This CL restores it, which is sufficient to allow the webapp
to start up properly when there is no NPAPI support.
Currently, every method of HostDispatcher can potentially
throw - these will all be fixed as part of a general
error-handling cleanup.
BUG=240000
TEST=remoting webapp loads on ChromeOS
R=jamiewalch@chromium.org
Review URL: https://codereview.chromium.org/14766013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200322 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/webapp')
| -rw-r--r-- | remoting/webapp/host_controller.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/remoting/webapp/host_controller.js b/remoting/webapp/host_controller.js index 40486d8..166017d 100644 --- a/remoting/webapp/host_controller.js +++ b/remoting/webapp/host_controller.js @@ -30,7 +30,11 @@ remoting.HostController = function() { } }; - this.hostDispatcher_.getDaemonVersion(printVersion); + try { + this.hostDispatcher_.getDaemonVersion(printVersion); + } catch (err) { + console.log('Host version not available.'); + } } // Note that the values in the enums below are copied from |