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

Unified Diff: content/shell/browser/shell_login_dialog.cc

Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/browser/shell_login_dialog.cc
diff --git a/content/shell/browser/shell_login_dialog.cc b/content/shell/browser/shell_login_dialog.cc
index b01fe987dd63e709698e0fee55bc56107575a3ae..b531b659a963b418ee390c53e93e7af7ecb66cc4 100644
--- a/content/shell/browser/shell_login_dialog.cc
+++ b/content/shell/browser/shell_login_dialog.cc
@@ -23,8 +23,8 @@ ShellLoginDialog::ShellLoginDialog(
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(&ShellLoginDialog::PrepDialog, this,
- ASCIIToUTF16(auth_info->challenger.ToString()),
- UTF8ToUTF16(auth_info->realm)));
+ base::ASCIIToUTF16(auth_info->challenger.ToString()),
+ base::UTF8ToUTF16(auth_info->realm)));
}
void ShellLoginDialog::OnRequestCancelled() {
@@ -77,13 +77,13 @@ void ShellLoginDialog::PrepDialog(const base::string16& host,
gfx::ElideString(realm, 120, &elided_realm);
base::string16 explanation =
- ASCIIToUTF16("The server ") + host +
- ASCIIToUTF16(" requires a username and password.");
+ base::ASCIIToUTF16("The server ") + host +
+ base::ASCIIToUTF16(" requires a username and password.");
if (!elided_realm.empty()) {
- explanation += ASCIIToUTF16(" The server says: ");
+ explanation += base::ASCIIToUTF16(" The server says: ");
explanation += elided_realm;
- explanation += ASCIIToUTF16(".");
+ explanation += base::ASCIIToUTF16(".");
}
PlatformCreateDialog(explanation);
« no previous file with comments | « content/shell/browser/shell_javascript_dialog_manager.cc ('k') | content/shell/browser/shell_login_dialog_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698