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

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

Issue 102593002: Convert string16 to base::string16 in content. (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
« no previous file with comments | « content/shell/browser/shell_login_dialog.h ('k') | content/shell/browser/shell_login_dialog_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 607fd66ac5aa4a519835f72e5208890e37eceb5c..b01fe987dd63e709698e0fee55bc56107575a3ae 100644
--- a/content/shell/browser/shell_login_dialog.cc
+++ b/content/shell/browser/shell_login_dialog.cc
@@ -34,8 +34,8 @@ void ShellLoginDialog::OnRequestCancelled() {
base::Bind(&ShellLoginDialog::PlatformRequestCancelled, this));
}
-void ShellLoginDialog::UserAcceptedAuth(const string16& username,
- const string16& password) {
+void ShellLoginDialog::UserAcceptedAuth(const base::string16& username,
+ const base::string16& password) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
@@ -48,7 +48,7 @@ void ShellLoginDialog::UserCancelledAuth() {
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
base::Bind(&ShellLoginDialog::SendAuthToRequester, this,
- false, string16(), string16()));
+ false, base::string16(), base::string16()));
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(&ShellLoginDialog::PlatformCleanUp, this));
@@ -63,20 +63,20 @@ ShellLoginDialog::~ShellLoginDialog() {
// Bogus implementations for linking. They are never called because
// ResourceDispatcherHostDelegate::CreateLoginDelegate returns NULL.
// TODO: implement ShellLoginDialog for other platforms, drop this #if
-void ShellLoginDialog::PlatformCreateDialog(const string16& message) {}
+void ShellLoginDialog::PlatformCreateDialog(const base::string16& message) {}
void ShellLoginDialog::PlatformCleanUp() {}
void ShellLoginDialog::PlatformRequestCancelled() {}
#endif
-void ShellLoginDialog::PrepDialog(const string16& host,
- const string16& realm) {
+void ShellLoginDialog::PrepDialog(const base::string16& host,
+ const base::string16& realm) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
// The realm is controlled by the remote server, so there is no reason to
// believe it is of a reasonable length.
- string16 elided_realm;
+ base::string16 elided_realm;
gfx::ElideString(realm, 120, &elided_realm);
- string16 explanation =
+ base::string16 explanation =
ASCIIToUTF16("The server ") + host +
ASCIIToUTF16(" requires a username and password.");
@@ -90,8 +90,8 @@ void ShellLoginDialog::PrepDialog(const string16& host,
}
void ShellLoginDialog::SendAuthToRequester(bool success,
- const string16& username,
- const string16& password) {
+ const base::string16& username,
+ const base::string16& password) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
if (success)
request_->SetAuth(net::AuthCredentials(username, password));
« no previous file with comments | « content/shell/browser/shell_login_dialog.h ('k') | content/shell/browser/shell_login_dialog_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698