From 6592639f64d398a3c279c98cd4a15741ebe17b9a Mon Sep 17 00:00:00 2001 From: Iain Merrick Date: Wed, 13 Oct 2010 15:08:26 +0100 Subject: Fixing WebKit APIs affected by Chromium 7.0.540.0 merge WebUrlLoaderClient, WebRequest: changing std::wstring to string16 http://src.chromium.org/viewvc/chrome?view=rev&revision=54101 HostResolver parameters changed, fixing WebRequestContext.cpp http://src.chromium.org/viewvc/chrome?view=rev&revision=57189 Icon parameter added to AutoFillHost, fixing AutoFillHostAndroid. http://src.chromium.org/viewvc/chrome?view=rev&revision=54052 Change-Id: If6a17af7da3b80d039205883019e4a73eb35f562 --- WebKit/android/WebCoreSupport/WebRequest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'WebKit/android/WebCoreSupport/WebRequest.cpp') diff --git a/WebKit/android/WebCoreSupport/WebRequest.cpp b/WebKit/android/WebCoreSupport/WebRequest.cpp index 937a365..e080bcd 100644 --- a/WebKit/android/WebCoreSupport/WebRequest.cpp +++ b/WebKit/android/WebCoreSupport/WebRequest.cpp @@ -326,7 +326,7 @@ void WebRequest::OnResponseStarted(URLRequest* request) } } -void WebRequest::setAuth(const std::wstring& username, const std::wstring& password) +void WebRequest::setAuth(const string16& username, const string16& password) { ASSERT(m_loadState == Started, "setAuth called on a WebRequest not in STARTED state (state=%d)", m_loadState); -- cgit v1.1