diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-25 19:40:10 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-12-03 13:52:53 +0000 |
| commit | 4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7 (patch) | |
| tree | 938665d93a11fe7a6d0124e3c1e020d1f9d3f947 /chrome/browser/sync/resources | |
| parent | 7c627d87728a355737862918d144f98f69406954 (diff) | |
| download | external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.zip external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.gz external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.bz2 | |
Merge Chromium at r66597: Initial merge by git.
Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
Diffstat (limited to 'chrome/browser/sync/resources')
| -rw-r--r-- | chrome/browser/sync/resources/passphrase.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/sync/resources/passphrase.html b/chrome/browser/sync/resources/passphrase.html index e18da44..4ea8317 100644 --- a/chrome/browser/sync/resources/passphrase.html +++ b/chrome/browser/sync/resources/passphrase.html @@ -52,8 +52,8 @@ html[os='mac'] input[type='submit'] { </style> <script src="chrome://resources/js/cr.js"></script> -<script> - var currentTab; +<script>
+ var currentMode; // Called once, when this html/js is loaded. function setupPassphraseDialog(args) { @@ -88,7 +88,8 @@ html[os='mac'] input[type='submit'] { function sendPassphraseAndClose() { var f = document.getElementById("passphraseForm"); - var result = JSON.stringify({"passphrase": f.passphrase.value}); + var result = JSON.stringify({"passphrase": f.passphrase.value, + "mode": currentMode}); chrome.send("Passphrase", [result]); } </script> |