Index: remoting/webapp/me2mom/remoting_session.js |
=================================================================== |
--- remoting/webapp/me2mom/remoting_session.js (revision 90608) |
+++ remoting/webapp/me2mom/remoting_session.js (working copy) |
@@ -134,6 +134,12 @@ |
plugin.desktopSizeUpdate = desktopSizeChanged; |
plugin.loginChallenge = loginChallengeCallback; |
+ if (typeof plugin.connect !== 'function') { |
+ setClientStateMessage("Unable to load plugin. Please make sure that " + |
+ "'Remoting' and 'P2P API' are enabled in chrome://flags."); |
+ return; |
+ } |
+ |
if (!checkVersion(plugin)) { |
// TODO(garykac): We need better messaging here. Perhaps an install link. |
setClientStateMessage("Out of date. Please re-install."); |
@@ -141,15 +147,7 @@ |
} |
addToDebugLog('Connect as user ' + remoting.username); |
- |
- // TODO(garykac): Clean exit if |connect| isn't a function. |
- if (typeof plugin.connect === 'function') { |
- registerConnection(); |
- } else { |
- addToDebugLog('ERROR: remoting plugin not loaded'); |
- setClientStateMessage('Plugin not loaded'); |
- } |
- |
+ registerConnection(); |
} |
function toggleScaleToFit() { |