| Index: remoting/webapp/host_screen.js
|
| diff --git a/remoting/webapp/host_screen.js b/remoting/webapp/host_screen.js
|
| index d1a26fcb11de2e13684ea61ebe94229c2139f398..bfa3827b7d1f09f255857916c270cfecdcff5e26 100644
|
| --- a/remoting/webapp/host_screen.js
|
| +++ b/remoting/webapp/host_screen.js
|
| @@ -33,25 +33,13 @@ remoting.tryShare = function() {
|
| var hostInstallDialog = null;
|
|
|
| var tryInitializeDispatcher = function() {
|
| - hostDispatcher.initialize(createPluginForIt2Me,
|
| - onDispatcherInitialized,
|
| + hostDispatcher.initialize(onDispatcherInitialized,
|
| onDispatcherInitializationFailed);
|
| }
|
|
|
| - /** @return {remoting.HostPlugin} */
|
| - var createPluginForIt2Me = function() {
|
| - return remoting.createNpapiPlugin(
|
| - document.getElementById('host-plugin-container'));
|
| - }
|
| -
|
| var onDispatcherInitialized = function () {
|
| - if (hostDispatcher.usingNpapi()) {
|
| - hostInstallDialog = new remoting.HostInstallDialog();
|
| - hostInstallDialog.show(tryInitializeDispatcher, onInstallError);
|
| - } else {
|
| - // Host alrady installed.
|
| - remoting.startHostUsingDispatcher_(hostDispatcher);
|
| - }
|
| + // Host already installed.
|
| + remoting.startHostUsingDispatcher_(hostDispatcher);
|
| };
|
|
|
| /** @param {remoting.Error} error */
|
| @@ -181,8 +169,6 @@ function onHostStateChanged_(state) {
|
| remoting.setMode(remoting.AppMode.HOST_SHARE_FINISHED);
|
| }
|
| }
|
| - remoting.hostSession.cleanup();
|
| -
|
| } else if (state == remoting.HostSession.State.ERROR) {
|
| console.error('Host state: ERROR');
|
| showShareError_(remoting.Error.UNEXPECTED);
|
|
|