Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.h

Issue 11414138: Encrypted Media: No NeedKey if --enable-encrypted-media is not set. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
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, 83 media::FilterCollection* collection,
84 WebKit::WebAudioSourceProvider* audio_source_provider, 84 WebKit::WebAudioSourceProvider* audio_source_provider,
85 media::AudioRendererSink* audio_renderer_sink, 85 media::AudioRendererSink* audio_renderer_sink,
86 media::MessageLoopFactory* message_loop_factory, 86 media::MessageLoopFactory* message_loop_factory,
87 webkit_media::MediaStreamClient* media_stream_client, 87 webkit_media::MediaStreamClient* media_stream_client,
88 bool encrypted_media_enabled,
88 media::MediaLog* media_log) OVERRIDE; 89 media::MediaLog* media_log) OVERRIDE;
89 virtual bool RunIdleHandlerWhenWidgetsHidden() OVERRIDE; 90 virtual bool RunIdleHandlerWhenWidgetsHidden() OVERRIDE;
90 virtual bool AllowPopup(const GURL& creator) OVERRIDE; 91 virtual bool AllowPopup(const GURL& creator) OVERRIDE;
91 virtual bool ShouldFork(WebKit::WebFrame* frame, 92 virtual bool ShouldFork(WebKit::WebFrame* frame,
92 const GURL& url, 93 const GURL& url,
93 bool is_initial_navigation, 94 bool is_initial_navigation,
94 bool* send_referrer) OVERRIDE; 95 bool* send_referrer) OVERRIDE;
95 virtual bool WillSendRequest(WebKit::WebFrame* frame, 96 virtual bool WillSendRequest(WebKit::WebFrame* frame,
96 content::PageTransition transition_type, 97 content::PageTransition transition_type,
97 const GURL& url, 98 const GURL& url,
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 scoped_ptr<RendererNetPredictor> net_predictor_; 173 scoped_ptr<RendererNetPredictor> net_predictor_;
173 scoped_ptr<SpellCheck> spellcheck_; 174 scoped_ptr<SpellCheck> spellcheck_;
174 scoped_ptr<VisitedLinkSlave> visited_link_slave_; 175 scoped_ptr<VisitedLinkSlave> visited_link_slave_;
175 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_; 176 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_;
176 scoped_ptr<prerender::PrerenderDispatcher> prerender_dispatcher_; 177 scoped_ptr<prerender::PrerenderDispatcher> prerender_dispatcher_;
177 }; 178 };
178 179
179 } // namespace chrome 180 } // namespace chrome
180 181
181 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 182 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/renderer/chrome_content_renderer_client.cc » ('j') | webkit/media/webmediaplayer_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698