| Index: chrome/browser/ui/crypto_module_password_dialog.h
|
| diff --git a/chrome/browser/ui/crypto_module_password_dialog.h b/chrome/browser/ui/crypto_module_password_dialog.h
|
| index 329eeb9ddc18d8cfdff75ccdef4cca7f1ed58a93..aa17339af750dccd517674883449a20c565a638d 100644
|
| --- a/chrome/browser/ui/crypto_module_password_dialog.h
|
| +++ b/chrome/browser/ui/crypto_module_password_dialog.h
|
| @@ -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.
|
|
|
| @@ -21,7 +21,7 @@ typedef std::vector<scoped_refptr<CryptoModule> > CryptoModuleList;
|
| class X509Certificate;
|
| }
|
|
|
| -namespace browser {
|
| +namespace chrome {
|
|
|
| // An enum to describe the reason for the password request.
|
| enum CryptoModulePasswordReason {
|
| @@ -39,24 +39,24 @@ typedef base::Callback<void(const char*)> CryptoModulePasswordCallback;
|
| // |module|. |reason| describes the purpose of the authentication and
|
| // affects the message displayed in the dialog. |server| is the name
|
| // of the server which requested the access.
|
| -void ShowCryptoModulePasswordDialog(const std::string& module_name,
|
| - bool retry,
|
| - CryptoModulePasswordReason reason,
|
| - const std::string& server,
|
| - const CryptoModulePasswordCallback& callback);
|
| +void ShowCryptoModulePasswordDialog(
|
| + const std::string& module_name,
|
| + bool retry,
|
| + CryptoModulePasswordReason reason,
|
| + const std::string& server,
|
| + const CryptoModulePasswordCallback& callback);
|
|
|
| // Returns a CryptoModuleBlockingPasswordDelegate to open a dialog and block
|
| // until returning. Should only be used on a worker thread.
|
| crypto::CryptoModuleBlockingPasswordDelegate*
|
| - NewCryptoModuleBlockingDialogDelegate(
|
| - CryptoModulePasswordReason reason,
|
| - const std::string& server);
|
| + NewCryptoModuleBlockingDialogDelegate(CryptoModulePasswordReason reason,
|
| + const std::string& server);
|
|
|
| // Asynchronously unlock |modules|, if necessary. |callback| is called when
|
| // done (regardless if any modules were successfully unlocked or not). Should
|
| // only be called on UI thread.
|
| void UnlockSlotsIfNecessary(const net::CryptoModuleList& modules,
|
| - browser::CryptoModulePasswordReason reason,
|
| + CryptoModulePasswordReason reason,
|
| const std::string& server,
|
| const base::Closure& callback);
|
|
|
| @@ -64,10 +64,10 @@ void UnlockSlotsIfNecessary(const net::CryptoModuleList& modules,
|
| // called when done (regardless if module was successfully unlocked or not).
|
| // Should only be called on UI thread.
|
| void UnlockCertSlotIfNecessary(net::X509Certificate* cert,
|
| - browser::CryptoModulePasswordReason reason,
|
| + CryptoModulePasswordReason reason,
|
| const std::string& server,
|
| const base::Closure& callback);
|
|
|
| -} // namespace browser
|
| +} // namespace chrome
|
|
|
| #endif // CHROME_BROWSER_UI_CRYPTO_MODULE_PASSWORD_DIALOG_H_
|
|
|