| Index: android_webview/browser/aw_login_delegate.h
|
| diff --git a/android_webview/browser/aw_login_delegate.h b/android_webview/browser/aw_login_delegate.h
|
| index 2542f06b9f8db6e8d5fd5b57c338e701597d7889..f0f8769ddb33aa69951b0976e4aa5dcfa9c50eb3 100644
|
| --- a/android_webview/browser/aw_login_delegate.h
|
| +++ b/android_webview/browser/aw_login_delegate.h
|
| @@ -24,7 +24,8 @@ class AwLoginDelegate :
|
| AwLoginDelegate(net::AuthChallengeInfo* auth_info,
|
| net::URLRequest* request);
|
|
|
| - virtual void Proceed(const string16& user, const string16& password);
|
| + virtual void Proceed(const base::string16& user,
|
| + const base::string16& password);
|
| virtual void Cancel();
|
|
|
| // from ResourceDispatcherHostLoginDelegate
|
| @@ -34,7 +35,8 @@ class AwLoginDelegate :
|
| virtual ~AwLoginDelegate();
|
| void HandleHttpAuthRequestOnUIThread(bool first_auth_attempt);
|
| void CancelOnIOThread();
|
| - void ProceedOnIOThread(const string16& user, const string16& password);
|
| + void ProceedOnIOThread(const base::string16& user,
|
| + const base::string16& password);
|
| void DeleteAuthHandlerSoon();
|
|
|
| scoped_ptr<AwHttpAuthHandlerBase> aw_http_auth_handler_;
|
|
|