chrome/browser/ui/views/crypto_module_password_dialog_view.cc - Issue 61643007: Update keygen to use correct NSS slot on ChromeOS multiprofile.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/crypto_module_password_dialog_view.cc

Issue 61643007: Update keygen to use correct NSS slot on ChromeOS multiprofile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: jam review changes Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/ui/views/crypto_module_password_dialog_view.cc

diff --git a/chrome/browser/ui/views/crypto_module_password_dialog_view.cc b/chrome/browser/ui/views/crypto_module_password_dialog_view.cc

index 7e6f2f739c1298f5a9a5ff08c3d5a49698116f9b..9e3e2de61058a0f107b50a01eec1cb130042d9c3 100644

--- a/chrome/browser/ui/views/crypto_module_password_dialog_view.cc

+++ b/chrome/browser/ui/views/crypto_module_password_dialog_view.cc

@@ -54,14 +54,14 @@ string16 CryptoModulePasswordDialogView::GetDialogButtonLabel(

}

bool CryptoModulePasswordDialogView::Cancel() {

- callback_.Run(static_cast<const char*>(NULL));

+ callback_.Run(std::string());

const base::string16 empty;

password_entry_->SetText(empty);

return true;

}

bool CryptoModulePasswordDialogView::Accept() {

- callback_.Run(UTF16ToUTF8(password_entry_->text()).c_str());

+ callback_.Run(UTF16ToUTF8(password_entry_->text()));

const base::string16 empty;

password_entry_->SetText(empty);

return true;