summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/crypto_module_password_dialog.cc
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-14 22:50:24 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-14 22:50:24 +0000
commitb64994a466e1ca537b4b81f434756b74c0571588 (patch)
tree13cfe509080244609d992c978f5af6a22b36628a /chrome/browser/ui/crypto_module_password_dialog.cc
parenta74b4eb1f4f1ed2723e1199edcf299924b7ffd6c (diff)
downloadchromium_src-b64994a466e1ca537b4b81f434756b74c0571588.zip
chromium_src-b64994a466e1ca537b4b81f434756b74c0571588.tar.gz
chromium_src-b64994a466e1ca537b4b81f434756b74c0571588.tar.bz2
Restore Gtk version of CryptoModulePasswordDialog.
BUG=114134 TEST=see bug Review URL: http://codereview.chromium.org/9387026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/crypto_module_password_dialog.cc')
-rw-r--r--chrome/browser/ui/crypto_module_password_dialog.cc24
1 files changed, 2 insertions, 22 deletions
diff --git a/chrome/browser/ui/crypto_module_password_dialog.cc b/chrome/browser/ui/crypto_module_password_dialog.cc
index 0fc0884..868400d 100644
--- a/chrome/browser/ui/crypto_module_password_dialog.cc
+++ b/chrome/browser/ui/crypto_module_password_dialog.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -8,18 +8,12 @@
#include "base/bind.h"
#include "base/synchronization/waitable_event.h"
#include "base/utf_string_conversions.h"
-#include "chrome/browser/ui/views/window.h"
#include "crypto/crypto_module_blocking_password_delegate.h"
#include "content/public/browser/browser_thread.h"
#include "googleurl/src/gurl.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
-#if defined(TOOLKIT_VIEWS)
-#include "chrome/browser/ui/views/crypto_module_password_dialog_view.h"
-#include "ui/views/widget/widget.h"
-#endif
-
using content::BrowserThread;
namespace {
@@ -94,25 +88,11 @@ class CryptoModuleBlockingDialogDelegate
namespace browser {
-void ShowCryptoModulePasswordDialog(
- const std::string& slot_name,
- bool retry,
- CryptoModulePasswordReason reason,
- const std::string& server,
- const CryptoModulePasswordCallback& callback) {
-#if defined(TOOLKIT_VIEWS)
- CryptoModulePasswordDialogView* dialog =
- new CryptoModulePasswordDialogView(
- slot_name, reason, server, callback);
- views::Widget* widget = CreateViewsWindow(NULL, dialog, STYLE_GENERIC);
- widget->Show();
-#endif
-}
-
crypto::CryptoModuleBlockingPasswordDelegate*
NewCryptoModuleBlockingDialogDelegate(
CryptoModulePasswordReason reason,
const std::string& server) {
return new CryptoModuleBlockingDialogDelegate(reason, server);
}
+
} // namespace browser