OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "android_webview/renderer/aw_content_renderer_client.h" | 5 #include "android_webview/renderer/aw_content_renderer_client.h" |
6 | 6 |
7 #include "android_webview/common/aw_resource.h" | 7 #include "android_webview/common/aw_resource.h" |
8 #include "android_webview/common/url_constants.h" | 8 #include "android_webview/common/url_constants.h" |
9 #include "android_webview/renderer/aw_render_view_ext.h" | 9 #include "android_webview/renderer/aw_render_view_ext.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 | 23 |
24 namespace android_webview { | 24 namespace android_webview { |
25 | 25 |
26 AwContentRendererClient::AwContentRendererClient() { | 26 AwContentRendererClient::AwContentRendererClient() { |
27 } | 27 } |
28 | 28 |
29 AwContentRendererClient::~AwContentRendererClient() { | 29 AwContentRendererClient::~AwContentRendererClient() { |
30 } | 30 } |
31 | 31 |
32 void AwContentRendererClient::RenderThreadStarted() { | 32 void AwContentRendererClient::RenderThreadStarted() { |
33 WebKit::WebString content_scheme( | 33 blink::WebString content_scheme( |
34 ASCIIToUTF16(android_webview::kContentScheme)); | 34 ASCIIToUTF16(android_webview::kContentScheme)); |
35 WebKit::WebSecurityPolicy::registerURLSchemeAsLocal(content_scheme); | 35 blink::WebSecurityPolicy::registerURLSchemeAsLocal(content_scheme); |
36 | 36 |
37 WebKit::WebString aw_scheme( | 37 blink::WebString aw_scheme( |
38 ASCIIToUTF16(android_webview::kAndroidWebViewVideoPosterScheme)); | 38 ASCIIToUTF16(android_webview::kAndroidWebViewVideoPosterScheme)); |
39 WebKit::WebSecurityPolicy::registerURLSchemeAsSecure(aw_scheme); | 39 blink::WebSecurityPolicy::registerURLSchemeAsSecure(aw_scheme); |
40 | 40 |
41 content::RenderThread* thread = content::RenderThread::Get(); | 41 content::RenderThread* thread = content::RenderThread::Get(); |
42 | 42 |
43 aw_render_process_observer_.reset(new AwRenderProcessObserver); | 43 aw_render_process_observer_.reset(new AwRenderProcessObserver); |
44 thread->AddObserver(aw_render_process_observer_.get()); | 44 thread->AddObserver(aw_render_process_observer_.get()); |
45 | 45 |
46 visited_link_slave_.reset(new visitedlink::VisitedLinkSlave); | 46 visited_link_slave_.reset(new visitedlink::VisitedLinkSlave); |
47 thread->AddObserver(visited_link_slave_.get()); | 47 thread->AddObserver(visited_link_slave_.get()); |
48 } | 48 } |
49 | 49 |
(...skipping 11 matching lines...) Expand all Loading... |
61 std::string AwContentRendererClient::GetDefaultEncoding() { | 61 std::string AwContentRendererClient::GetDefaultEncoding() { |
62 return AwResource::GetDefaultTextEncoding(); | 62 return AwResource::GetDefaultTextEncoding(); |
63 } | 63 } |
64 | 64 |
65 bool AwContentRendererClient::HasErrorPage(int http_status_code, | 65 bool AwContentRendererClient::HasErrorPage(int http_status_code, |
66 std::string* error_domain) { | 66 std::string* error_domain) { |
67 return http_status_code >= 400; | 67 return http_status_code >= 400; |
68 } | 68 } |
69 | 69 |
70 void AwContentRendererClient::GetNavigationErrorStrings( | 70 void AwContentRendererClient::GetNavigationErrorStrings( |
71 WebKit::WebFrame* /* frame */, | 71 blink::WebFrame* /* frame */, |
72 const WebKit::WebURLRequest& failed_request, | 72 const blink::WebURLRequest& failed_request, |
73 const WebKit::WebURLError& error, | 73 const blink::WebURLError& error, |
74 const std::string& accept_languages, | 74 const std::string& accept_languages, |
75 std::string* error_html, | 75 std::string* error_html, |
76 string16* error_description) { | 76 string16* error_description) { |
77 if (error_html) { | 77 if (error_html) { |
78 GURL error_url(failed_request.url()); | 78 GURL error_url(failed_request.url()); |
79 std::string err = UTF16ToUTF8(error.localizedDescription); | 79 std::string err = UTF16ToUTF8(error.localizedDescription); |
80 std::string contents; | 80 std::string contents; |
81 if (err.empty()) { | 81 if (err.empty()) { |
82 contents = AwResource::GetNoDomainPageContent(); | 82 contents = AwResource::GetNoDomainPageContent(); |
83 } else { | 83 } else { |
(...skipping 17 matching lines...) Expand all Loading... |
101 const char* canonical_url, | 101 const char* canonical_url, |
102 size_t length) { | 102 size_t length) { |
103 return visited_link_slave_->ComputeURLFingerprint(canonical_url, length); | 103 return visited_link_slave_->ComputeURLFingerprint(canonical_url, length); |
104 } | 104 } |
105 | 105 |
106 bool AwContentRendererClient::IsLinkVisited(unsigned long long link_hash) { | 106 bool AwContentRendererClient::IsLinkVisited(unsigned long long link_hash) { |
107 return visited_link_slave_->IsVisited(link_hash); | 107 return visited_link_slave_->IsVisited(link_hash); |
108 } | 108 } |
109 | 109 |
110 } // namespace android_webview | 110 } // namespace android_webview |
OLD | NEW |