Index: chrome/browser/ui/crypto_module_password_dialog.cc |
diff --git a/chrome/browser/ui/crypto_module_password_dialog.cc b/chrome/browser/ui/crypto_module_password_dialog.cc |
new file mode 100644 |
index 0000000000000000000000000000000000000000..81d9e837c75eaa18ad55032a52aa6f437592c363 |
--- /dev/null |
+++ b/chrome/browser/ui/crypto_module_password_dialog.cc |
@@ -0,0 +1,106 @@ |
+// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
+// Use of this source code is governed by a BSD-style license that can be |
+// found in the LICENSE file. |
+ |
+#include "chrome/browser/ui/crypto_module_password_dialog.h" |
+ |
+#include "base/basictypes.h" |
+#include "base/bind.h" |
+#include "base/synchronization/waitable_event.h" |
+#include "base/utf_string_conversions.h" |
+#include "crypto/crypto_module_blocking_password_delegate.h" |
+#include "content/browser/browser_thread.h" |
+#include "googleurl/src/gurl.h" |
+#include "grit/generated_resources.h" |
+#include "ui/base/l10n/l10n_util.h" |
+ |
+#if defined(OS_WIN) || defined(TOOLKIT_VIEWS) |
Greg Spencer (Chromium)
2011/10/05 23:41:16
It seems to me that you don't need the "defined(OS
alicet1
2011/10/06 22:04:08
Done.
|
+#include "chrome/browser/ui/crypto_module_password_dialog_view.h" |
+#include "views/widget/widget.h" |
+#endif |
+ |
+namespace { |
+ |
+class CryptoModuleBlockingDialogDelegate |
+ : public crypto::CryptoModuleBlockingPasswordDelegate { |
+ public: |
+ CryptoModuleBlockingDialogDelegate(browser::CryptoModulePasswordReason reason, |
+ const std::string& server) |
+ : event_(false, false), |
+ reason_(reason), |
+ server_(server), |
+ password_(), |
Greg Spencer (Chromium)
2011/10/05 23:41:16
No need for this: it'll get initialized regardless
alicet1
2011/10/06 22:04:08
Done.
|
+ cancelled_(false) { |
+ } |
+ |
+ ~CryptoModuleBlockingDialogDelegate() { |
+ password_.replace(0, password_.size(), password_.size(), 0); |
+ } |
+ |
+ // crypto::CryptoModuleBlockingDialogDelegate implementation. |
+ virtual std::string RequestPassword(const std::string& slot_name, bool retry, |
+ bool* cancelled) { |
+ DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK(!event_.IsSignaled()); |
+ event_.Reset(); |
+ |
+ if (BrowserThread::PostTask( |
+ BrowserThread::UI, FROM_HERE, |
+ base::Bind(&CryptoModuleBlockingDialogDelegate::ShowDialog, |
+ // We block on event_ until the task completes, so |
+ // there's no need to ref-count. |
+ base::Unretained(this), |
+ slot_name, |
+ retry))) { |
+ event_.Wait(); |
+ } |
+ *cancelled = cancelled_; |
+ return password_; |
+ } |
+ |
+ private: |
+ void ShowDialog(const std::string& slot_name, bool retry) { |
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ ShowCryptoModulePasswordDialog( |
+ slot_name, retry, reason_, server_, |
+ base::Bind(&CryptoModuleBlockingDialogDelegate::GotPassword, |
+ base::Unretained(this))); |
Greg Spencer (Chromium)
2011/10/05 23:41:16
Maybe a similar comment here about why it doesn't
alicet1
2011/10/06 22:04:08
Done.
|
+ } |
+ void GotPassword(const char* password) { |
+ if (password) |
+ password_ = password; |
+ else |
+ cancelled_ = true; |
+ event_.Signal(); |
+ } |
+ base::WaitableEvent event_; |
+ browser::CryptoModulePasswordReason reason_; |
+ std::string server_; |
+ std::string password_; |
+ bool cancelled_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(CryptoModuleBlockingDialogDelegate); |
+}; |
+} // namespace |
+ |
+namespace browser { |
+ |
+void ShowCryptoModulePasswordDialog( |
+ const std::string& slot_name, |
+ bool retry, |
+ CryptoModulePasswordReason reason, |
+ const std::string& server, |
+ const CryptoModulePasswordCallback& callback) { |
+#if defined(OS_WIN) || defined(TOOLKIT_VIEWS) |
Greg Spencer (Chromium)
2011/10/05 23:41:16
Again, I don't think you need OS_WIN here.
alicet1
2011/10/06 22:04:08
Done.
|
+ (new CryptoModulePasswordDialogView( |
+ slot_name, reason, server, callback))->GetWidget()->Show(); |
+#endif |
+} |
+ |
+crypto::CryptoModuleBlockingPasswordDelegate* |
+ NewCryptoModuleBlockingDialogDelegate( |
+ CryptoModulePasswordReason reason, |
+ const std::string& server) { |
+ return new CryptoModuleBlockingDialogDelegate(reason, server); |
+} |
+} // namespace browser |