Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3494)

Unified Diff: chrome/browser/ui/login/login_prompt_mac.mm

Issue 6312154: Remove wstring from RVH's run Javascript command.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/login/login_prompt_mac.mm
===================================================================
--- chrome/browser/ui/login/login_prompt_mac.mm (revision 73855)
+++ chrome/browser/ui/login/login_prompt_mac.mm (working copy)
@@ -53,7 +53,7 @@
// LoginHandler:
virtual void BuildViewForPasswordManager(PasswordManager* manager,
- std::wstring explanation) {
+ const string16& explanation) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
// Load nib here instead of in constructor.
@@ -64,7 +64,7 @@
SetModel(manager);
- [sheet_controller_ setExplanation:base::SysWideToNSString(explanation)];
+ [sheet_controller_ setExplanation:base::SysUTF16ToNSString(explanation)];
// Scary thread safety note: This can potentially be called *after* SetAuth
// or CancelAuth (say, if the request was cancelled before the UI thread got
@@ -92,8 +92,8 @@
ReleaseSoon();
}
- void OnLoginPressed(const std::wstring& username,
- const std::wstring& password) {
+ void OnLoginPressed(const string16& username,
+ const string16& password) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
SetAuth(username, password);
@@ -147,8 +147,9 @@
- (IBAction)loginPressed:(id)sender {
using base::SysNSStringToWide;
[NSApp endSheet:[self window]];
- handler_->OnLoginPressed(SysNSStringToWide([nameField_ stringValue]),
- SysNSStringToWide([passwordField_ stringValue]));
+ handler_->OnLoginPressed(
+ base::SysNSStringToUTF16([nameField_ stringValue]),
+ base::SysNSStringToUTF16([passwordField_ stringValue]));
}
- (IBAction)cancelPressed:(id)sender {

Powered by Google App Engine
This is Rietveld 408576698