diff options
| author | garykac <garykac@chromium.org> | 2014-11-18 09:28:10 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-18 17:28:26 +0000 |
| commit | 76b735208764148d18bac5e1c91ec20cd464c01b (patch) | |
| tree | 628a629aa5ba2a37daa68aa6630a35e89831fe03 /remoting | |
| parent | 76eafd0a8468d0149e84adbe111914553dd6b346 (diff) | |
| download | chromium_src-76b735208764148d18bac5e1c91ec20cd464c01b.zip chromium_src-76b735208764148d18bac5e1c91ec20cd464c01b.tar.gz chromium_src-76b735208764148d18bac5e1c91ec20cd464c01b.tar.bz2 | |
[Chromoting] Add auth dialog to window shape
NOTRY=True
BUG=
Review URL: https://codereview.chromium.org/738563002
Cr-Commit-Position: refs/heads/master@{#304629}
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/webapp/base/html/dialog_auth.html | 2 | ||||
| -rw-r--r-- | remoting/webapp/crd/js/remoting.js | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/remoting/webapp/base/html/dialog_auth.html b/remoting/webapp/base/html/dialog_auth.html index b57e5a5..209f1c8 100644 --- a/remoting/webapp/base/html/dialog_auth.html +++ b/remoting/webapp/base/html/dialog_auth.html @@ -8,7 +8,7 @@ found in the LICENSE file. <div class="dialog-screen"></div> <div class="dialog-container"> - <div class="kd-modaldialog"> + <div id="auth-dialog-border" class="kd-modaldialog"> <h2 i18n-content="MODE_AUTHORIZE"></h2> <p id="auth-error-message" i18n-content="DESCRIPTION_AUTHORIZE" diff --git a/remoting/webapp/crd/js/remoting.js b/remoting/webapp/crd/js/remoting.js index f80922f..c2bedd1 100644 --- a/remoting/webapp/crd/js/remoting.js +++ b/remoting/webapp/crd/js/remoting.js @@ -35,6 +35,14 @@ function consentRequired_(authContinue) { remoting.windowShape.updateClientWindowShape(); }; dialog.hidden = false; + + /** @type {HTMLElement} */ + var dialog_border = document.getElementById('auth-dialog-border'); + // TODO(garykac): Refactor to remove auth dialog from the main html file + // and place in a separate window. + remoting.authDialog = new remoting.AuthDialog(dialog_border); + remoting.windowShape.addCallback(remoting.authDialog); + button.addEventListener('click', consentGranted, false); } |