summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-17 21:59:37 +0000
committerwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-17 21:59:37 +0000
commit078ebd6107c15aa4fce44dbdeae3a0adc09f10d2 (patch)
tree592e12a8e522ead301e4ccd90e665702fedc220b /remoting
parent68eff95f3458adc808e3d700e0c682f80ef73ffd (diff)
downloadchromium_src-078ebd6107c15aa4fce44dbdeae3a0adc09f10d2.zip
chromium_src-078ebd6107c15aa4fce44dbdeae3a0adc09f10d2.tar.gz
chromium_src-078ebd6107c15aa4fce44dbdeae3a0adc09f10d2.tar.bz2
Ensure that the ClientSession and plugin element are torn down before retrying.
Without this, the plugin element from the failed connection attempt will handle blur events and re-take keyboard focus, preventing events from reaching the connected plugin element. BUG=110500 Review URL: http://codereview.chromium.org/9422007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122594 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/webapp/client_screen.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/remoting/webapp/client_screen.js b/remoting/webapp/client_screen.js
index 2db2d52..89d2c16 100644
--- a/remoting/webapp/client_screen.js
+++ b/remoting/webapp/client_screen.js
@@ -271,6 +271,10 @@ function onClientStateChange_(oldState, newState) {
* @return {void} Nothing.
*/
function retryConnectOrReportOffline_() {
+ if (remoting.clientSession) {
+ remoting.clientSession.removePlugin();
+ remoting.clientSession = null;
+ }
if (remoting.hostId && remoting.retryIfOffline) {
console.log('Connection failed. Retrying.');
/** @param {boolean} success True if the refresh was successful. */