Index: chrome/browser/ui/login/login_prompt.cc |
=================================================================== |
--- chrome/browser/ui/login/login_prompt.cc (revision 73805) |
+++ chrome/browser/ui/login/login_prompt.cc (working copy) |
@@ -113,8 +113,8 @@ |
tab_contents_id_); |
} |
-void LoginHandler::SetAuth(const std::wstring& username, |
- const std::wstring& password) { |
+void LoginHandler::SetAuth(const string16& username, |
+ const string16& password) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
if (TestAndSetAuthHandled()) |
@@ -122,8 +122,8 @@ |
// Tell the password manager the credentials were submitted / accepted. |
if (password_manager_) { |
- password_form_.username_value = WideToUTF16Hack(username); |
- password_form_.password_value = WideToUTF16Hack(password); |
+ password_form_.username_value = username; |
+ password_form_.password_value = password; |
password_manager_->ProvisionallySavePassword(password_form_); |
} |
@@ -280,8 +280,8 @@ |
Details<LoginNotificationDetails>(&details)); |
} |
-void LoginHandler::NotifyAuthSupplied(const std::wstring& username, |
- const std::wstring& password) { |
+void LoginHandler::NotifyAuthSupplied(const string16& username, |
+ const string16& password) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
DCHECK(WasAuthHandled()); |
@@ -332,12 +332,12 @@ |
} |
// Calls SetAuth from the IO loop. |
-void LoginHandler::SetAuthDeferred(const std::wstring& username, |
- const std::wstring& password) { |
+void LoginHandler::SetAuthDeferred(const string16& username, |
+ const string16& password) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
if (request_) { |
- request_->SetAuth(WideToUTF16Hack(username), WideToUTF16Hack(password)); |
+ request_->SetAuth(username, password); |
ResetLoginHandlerForRequest(request_); |
} |
} |
@@ -408,8 +408,7 @@ |
l10n_util::GetStringFUTF16(IDS_LOGIN_DIALOG_DESCRIPTION, |
host_and_port_hack16, |
realm_hack16); |
- handler_->BuildViewForPasswordManager(password_manager, |
- UTF16ToWideHack(explanation)); |
+ handler_->BuildViewForPasswordManager(password_manager, explanation); |
} |
private: |