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 #ifndef CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ | 5 #ifndef CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ |
6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ | 6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <set> | 9 #include <set> |
10 #include <string> | 10 #include <string> |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 WebKit::WebFrame* frame, | 52 WebKit::WebFrame* frame, |
53 const WebKit::WebPluginParams& params, | 53 const WebKit::WebPluginParams& params, |
54 WebKit::WebPlugin** plugin) OVERRIDE; | 54 WebKit::WebPlugin** plugin) OVERRIDE; |
55 virtual bool HasErrorPage(int http_status_code, | 55 virtual bool HasErrorPage(int http_status_code, |
56 std::string* error_domain) OVERRIDE; | 56 std::string* error_domain) OVERRIDE; |
57 virtual void GetNavigationErrorStrings( | 57 virtual void GetNavigationErrorStrings( |
58 const WebKit::WebURLRequest& failed_request, | 58 const WebKit::WebURLRequest& failed_request, |
59 const WebKit::WebURLError& error, | 59 const WebKit::WebURLError& error, |
60 std::string* error_html, | 60 std::string* error_html, |
61 string16* error_description) OVERRIDE; | 61 string16* error_description) OVERRIDE; |
| 62 virtual bool OverrideCreateWebMediaPlayer( |
| 63 content::RenderView* render_view, |
| 64 WebKit::WebMediaPlayerClient* client, |
| 65 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate, |
| 66 media::FilterCollection* collection, |
| 67 media::MessageLoopFactory* message_loop_factory, |
| 68 webkit_media::MediaStreamClient* media_stream_client, |
| 69 media::MediaLog* media_log, |
| 70 webkit_media::WebMediaPlayerImpl** player) OVERRIDE; |
62 virtual bool RunIdleHandlerWhenWidgetsHidden() OVERRIDE; | 71 virtual bool RunIdleHandlerWhenWidgetsHidden() OVERRIDE; |
63 virtual bool AllowPopup(const GURL& creator) OVERRIDE; | 72 virtual bool AllowPopup(const GURL& creator) OVERRIDE; |
64 virtual bool ShouldFork(WebKit::WebFrame* frame, | 73 virtual bool ShouldFork(WebKit::WebFrame* frame, |
65 const GURL& url, | 74 const GURL& url, |
66 bool is_content_initiated, | 75 bool is_content_initiated, |
67 bool is_initial_navigation, | 76 bool is_initial_navigation, |
68 bool* send_referrer) OVERRIDE; | 77 bool* send_referrer) OVERRIDE; |
69 virtual bool WillSendRequest(WebKit::WebFrame* frame, | 78 virtual bool WillSendRequest(WebKit::WebFrame* frame, |
70 const GURL& url, | 79 const GURL& url, |
71 GURL* new_url) OVERRIDE; | 80 GURL* new_url) OVERRIDE; |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 scoped_ptr<VisitedLinkSlave> visited_link_slave_; | 158 scoped_ptr<VisitedLinkSlave> visited_link_slave_; |
150 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_; | 159 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_; |
151 | 160 |
152 // Set of origins that can use TCP/UDP private APIs from NaCl. | 161 // Set of origins that can use TCP/UDP private APIs from NaCl. |
153 std::set<std::string> allowed_socket_origins_; | 162 std::set<std::string> allowed_socket_origins_; |
154 }; | 163 }; |
155 | 164 |
156 } // namespace chrome | 165 } // namespace chrome |
157 | 166 |
158 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ | 167 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ |
OLD | NEW |