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/renderer/mock_content_renderer_client.h" | 5 #include "content/renderer/mock_content_renderer_client.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include "v8/include/v8.h" | 8 #include "v8/include/v8.h" |
9 | 9 |
10 namespace content { | 10 namespace content { |
(...skipping 24 matching lines...) Expand all Loading... | |
35 const WebKit::WebPluginParams& params, | 35 const WebKit::WebPluginParams& params, |
36 WebKit::WebPlugin** plugin) { | 36 WebKit::WebPlugin** plugin) { |
37 return false; | 37 return false; |
38 } | 38 } |
39 | 39 |
40 void MockContentRendererClient::ShowErrorPage(RenderView* render_view, | 40 void MockContentRendererClient::ShowErrorPage(RenderView* render_view, |
41 WebKit::WebFrame* frame, | 41 WebKit::WebFrame* frame, |
42 int http_status_code) { | 42 int http_status_code) { |
43 } | 43 } |
44 | 44 |
45 std::string MockContentRendererClient::GetNavigationErrorHtml( | 45 void MockContentRendererClient::GetNavigationErrorStrings( |
46 const WebKit::WebURLRequest& failed_request, | 46 const WebKit::WebURLRequest& failed_request, |
47 const WebKit::WebURLError& error) { | 47 const WebKit::WebURLError& error, |
48 return std::string(); | 48 std::string* error_html, |
49 string16* error_description) { | |
50 if (NULL != error_html) | |
mmenke
2011/10/07 14:19:44
nit: Reverse order here, too, and reduce indent o
mkosiba (inactive)
2011/10/07 15:46:11
Done.
| |
51 *error_html = std::string(); | |
52 if (NULL != error_description) | |
53 *error_description = string16(); | |
49 } | 54 } |
50 | 55 |
51 bool MockContentRendererClient::RunIdleHandlerWhenWidgetsHidden() { | 56 bool MockContentRendererClient::RunIdleHandlerWhenWidgetsHidden() { |
52 return true; | 57 return true; |
53 } | 58 } |
54 | 59 |
55 bool MockContentRendererClient::AllowPopup(const GURL& creator) { | 60 bool MockContentRendererClient::AllowPopup(const GURL& creator) { |
56 return false; | 61 return false; |
57 } | 62 } |
58 | 63 |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
115 const GURL& first_party_for_cookies, | 120 const GURL& first_party_for_cookies, |
116 const std::string& value) { | 121 const std::string& value) { |
117 return false; | 122 return false; |
118 } | 123 } |
119 | 124 |
120 bool MockContentRendererClient::IsProtocolSupportedForMedia(const GURL& url) { | 125 bool MockContentRendererClient::IsProtocolSupportedForMedia(const GURL& url) { |
121 return false; | 126 return false; |
122 } | 127 } |
123 | 128 |
124 } // namespace content | 129 } // namespace content |
OLD | NEW |