OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "content/shell/shell_content_renderer_client.h" | 5 #include "content/shell/shell_content_renderer_client.h" |
6 | 6 |
7 #include "v8/include/v8.h" | 7 #include "v8/include/v8.h" |
8 | 8 |
9 namespace content { | 9 namespace content { |
10 | 10 |
(...skipping 23 matching lines...) Expand all Loading... | |
34 const WebKit::WebPluginParams& params, | 34 const WebKit::WebPluginParams& params, |
35 WebKit::WebPlugin** plugin) { | 35 WebKit::WebPlugin** plugin) { |
36 return false; | 36 return false; |
37 } | 37 } |
38 | 38 |
39 void ShellContentRendererClient::ShowErrorPage(RenderView* render_view, | 39 void ShellContentRendererClient::ShowErrorPage(RenderView* render_view, |
40 WebKit::WebFrame* frame, | 40 WebKit::WebFrame* frame, |
41 int http_status_code) { | 41 int http_status_code) { |
42 } | 42 } |
43 | 43 |
44 std::string ShellContentRendererClient::GetNavigationErrorHtml( | 44 void ShellContentRendererClient::GetNavigationErrorStrings( |
45 const WebKit::WebURLRequest& failed_request, | 45 const WebKit::WebURLRequest& failed_request, |
46 const WebKit::WebURLError& error) { | 46 const WebKit::WebURLError& error, |
47 return std::string(); | 47 std::string* error_html, |
48 string16* error_description) { | |
49 if (NULL != error_html) | |
50 *error_html = std::string(); | |
mmenke
2011/10/07 14:19:44
nit: Should be indenting only 2 here, not 4.
mkosiba (inactive)
2011/10/07 15:46:11
Done.
| |
51 if (NULL != error_description) | |
52 *error_description = string16(); | |
48 } | 53 } |
49 | 54 |
50 bool ShellContentRendererClient::RunIdleHandlerWhenWidgetsHidden() { | 55 bool ShellContentRendererClient::RunIdleHandlerWhenWidgetsHidden() { |
51 return true; | 56 return true; |
52 } | 57 } |
53 | 58 |
54 bool ShellContentRendererClient::AllowPopup(const GURL& creator) { | 59 bool ShellContentRendererClient::AllowPopup(const GURL& creator) { |
55 return false; | 60 return false; |
56 } | 61 } |
57 | 62 |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
114 const GURL& first_party_for_cookies, | 119 const GURL& first_party_for_cookies, |
115 const std::string& value) { | 120 const std::string& value) { |
116 return false; | 121 return false; |
117 } | 122 } |
118 | 123 |
119 bool ShellContentRendererClient::IsProtocolSupportedForMedia(const GURL& url) { | 124 bool ShellContentRendererClient::IsProtocolSupportedForMedia(const GURL& url) { |
120 return false; | 125 return false; |
121 } | 126 } |
122 | 127 |
123 } // namespace content | 128 } // namespace content |
OLD | NEW |