diff options
| author | kelvinp <kelvinp@chromium.org> | 2015-04-09 16:08:00 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-09 23:08:51 +0000 |
| commit | add0aec088f13a96855f51c00e30c8a0742e94d1 (patch) | |
| tree | 69e80c21e2ac856926b0710bdfb1bcdccb5861f2 /remoting/webapp/base/js/modal_dialogs.js | |
| parent | e841ac2796e29249c02085123a7e0825132576e5 (diff) | |
| download | chromium_src-add0aec088f13a96855f51c00e30c8a0742e94d1.zip chromium_src-add0aec088f13a96855f51c00e30c8a0742e94d1.tar.gz chromium_src-add0aec088f13a96855f51c00e30c8a0742e94d1.tar.bz2 | |
[Webapp Refactor] Clean up public interface of SessionConnector.
This CL cleans up the public interface of SessionConnector
- Merges closeSession(), cancel() and resetConnection() into one single method
closeSession().
- Moves the smart reconnector to Me2MeActivity.
- Moves the Me2Me specific retry logic retryConnectMe2Me() into Me2MeActivity.
Once this is done, getHostId() and updatePairingInfo() is no longer needed.
- Moves ConnectXX2XX function into the appropriate activities.
BUG=474840
TEST=All Remoting Webapp Unittests and all chromoting browser tests passed.
https://chromium-swarm.appspot.com/user/task/26b40d0e44857d10
Review URL: https://codereview.chromium.org/1070903004
Cr-Commit-Position: refs/heads/master@{#324533}
Diffstat (limited to 'remoting/webapp/base/js/modal_dialogs.js')
| -rw-r--r-- | remoting/webapp/base/js/modal_dialogs.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/remoting/webapp/base/js/modal_dialogs.js b/remoting/webapp/base/js/modal_dialogs.js index 0aa3416..f8837e5 100644 --- a/remoting/webapp/base/js/modal_dialogs.js +++ b/remoting/webapp/base/js/modal_dialogs.js @@ -117,6 +117,7 @@ remoting.MessageDialog = function(mode, primaryButton, opt_secondaryButton) { * the button clicked. */ remoting.MessageDialog.prototype.show = function() { + base.debug.assert(this.eventHooks_ === null); this.eventHooks_ = new base.Disposables(new base.DomEventHook( this.primaryButton_, 'click', this.onClicked_.bind(this, remoting.MessageDialog.Result.PRIMARY), |