| Index: android_webview/renderer/aw_content_renderer_client.cc
|
| diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc
|
| index d8c3520e05fb681f8f4d392c967efb971cd840ca..cf65c39bfb36f86c18c7b0b379737e4db49cde18 100644
|
| --- a/android_webview/renderer/aw_content_renderer_client.cc
|
| +++ b/android_webview/renderer/aw_content_renderer_client.cc
|
| @@ -30,13 +30,13 @@ AwContentRendererClient::~AwContentRendererClient() {
|
| }
|
|
|
| void AwContentRendererClient::RenderThreadStarted() {
|
| - WebKit::WebString content_scheme(
|
| + blink::WebString content_scheme(
|
| ASCIIToUTF16(android_webview::kContentScheme));
|
| - WebKit::WebSecurityPolicy::registerURLSchemeAsLocal(content_scheme);
|
| + blink::WebSecurityPolicy::registerURLSchemeAsLocal(content_scheme);
|
|
|
| - WebKit::WebString aw_scheme(
|
| + blink::WebString aw_scheme(
|
| ASCIIToUTF16(android_webview::kAndroidWebViewVideoPosterScheme));
|
| - WebKit::WebSecurityPolicy::registerURLSchemeAsSecure(aw_scheme);
|
| + blink::WebSecurityPolicy::registerURLSchemeAsSecure(aw_scheme);
|
|
|
| content::RenderThread* thread = content::RenderThread::Get();
|
|
|
| @@ -68,9 +68,9 @@ bool AwContentRendererClient::HasErrorPage(int http_status_code,
|
| }
|
|
|
| void AwContentRendererClient::GetNavigationErrorStrings(
|
| - WebKit::WebFrame* /* frame */,
|
| - const WebKit::WebURLRequest& failed_request,
|
| - const WebKit::WebURLError& error,
|
| + blink::WebFrame* /* frame */,
|
| + const blink::WebURLRequest& failed_request,
|
| + const blink::WebURLError& error,
|
| const std::string& accept_languages,
|
| std::string* error_html,
|
| string16* error_description) {
|
|
|