OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #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 | 7 |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
73 virtual void GetNavigationErrorStrings( | 73 virtual void GetNavigationErrorStrings( |
74 const WebKit::WebURLRequest& failed_request, | 74 const WebKit::WebURLRequest& failed_request, |
75 const WebKit::WebURLError& error, | 75 const WebKit::WebURLError& error, |
76 std::string* error_html, | 76 std::string* error_html, |
77 string16* error_description) OVERRIDE; | 77 string16* error_description) OVERRIDE; |
78 virtual webkit_media::WebMediaPlayerImpl* OverrideCreateWebMediaPlayer( | 78 virtual webkit_media::WebMediaPlayerImpl* OverrideCreateWebMediaPlayer( |
79 content::RenderView* render_view, | 79 content::RenderView* render_view, |
80 WebKit::WebFrame* frame, | 80 WebKit::WebFrame* frame, |
81 WebKit::WebMediaPlayerClient* client, | 81 WebKit::WebMediaPlayerClient* client, |
82 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate, | 82 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate, |
83 media::FilterCollection* collection, | |
84 WebKit::WebAudioSourceProvider* audio_source_provider, | 83 WebKit::WebAudioSourceProvider* audio_source_provider, |
85 media::AudioRendererSink* audio_renderer_sink, | 84 media::AudioRendererSink* audio_renderer_sink, |
86 media::MessageLoopFactory* message_loop_factory, | 85 const scoped_refptr<media::GpuVideoDecoder::Factories>& gpu_factories, |
scherkus (not reviewing)
2012/12/07 23:54:11
we can't forward declare the inner class, resultin
jam
2012/12/10 04:23:03
this is why the style guide says to avoid nested c
| |
87 webkit_media::MediaStreamClient* media_stream_client, | 86 webkit_media::MediaStreamClient* media_stream_client, |
88 media::MediaLog* media_log) OVERRIDE; | 87 media::MediaLog* media_log) OVERRIDE; |
89 virtual bool RunIdleHandlerWhenWidgetsHidden() OVERRIDE; | 88 virtual bool RunIdleHandlerWhenWidgetsHidden() OVERRIDE; |
90 virtual bool AllowPopup() OVERRIDE; | 89 virtual bool AllowPopup() OVERRIDE; |
91 virtual bool ShouldFork(WebKit::WebFrame* frame, | 90 virtual bool ShouldFork(WebKit::WebFrame* frame, |
92 const GURL& url, | 91 const GURL& url, |
93 bool is_initial_navigation, | 92 bool is_initial_navigation, |
94 bool* send_referrer) OVERRIDE; | 93 bool* send_referrer) OVERRIDE; |
95 virtual bool WillSendRequest(WebKit::WebFrame* frame, | 94 virtual bool WillSendRequest(WebKit::WebFrame* frame, |
96 content::PageTransition transition_type, | 95 content::PageTransition transition_type, |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
177 scoped_ptr<RendererNetPredictor> net_predictor_; | 176 scoped_ptr<RendererNetPredictor> net_predictor_; |
178 scoped_ptr<SpellCheck> spellcheck_; | 177 scoped_ptr<SpellCheck> spellcheck_; |
179 scoped_ptr<VisitedLinkSlave> visited_link_slave_; | 178 scoped_ptr<VisitedLinkSlave> visited_link_slave_; |
180 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_; | 179 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_; |
181 scoped_ptr<prerender::PrerenderDispatcher> prerender_dispatcher_; | 180 scoped_ptr<prerender::PrerenderDispatcher> prerender_dispatcher_; |
182 }; | 181 }; |
183 | 182 |
184 } // namespace chrome | 183 } // namespace chrome |
185 | 184 |
186 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ | 185 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ |
OLD | NEW |