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

Side by Side Diff: content/public/renderer/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 CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_ 5 #ifndef CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_
6 #define CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_ 6 #define CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/string16.h" 10 #include "base/string16.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 virtual webkit_media::WebMediaPlayerImpl* OverrideCreateWebMediaPlayer( 120 virtual webkit_media::WebMediaPlayerImpl* OverrideCreateWebMediaPlayer(
121 RenderView* render_view, 121 RenderView* render_view,
122 WebKit::WebFrame* frame, 122 WebKit::WebFrame* frame,
123 WebKit::WebMediaPlayerClient* client, 123 WebKit::WebMediaPlayerClient* client,
124 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate, 124 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
125 media::FilterCollection* collection, 125 media::FilterCollection* collection,
126 WebKit::WebAudioSourceProvider* audio_source_provider, 126 WebKit::WebAudioSourceProvider* audio_source_provider,
127 media::AudioRendererSink* audio_renderer_sink, 127 media::AudioRendererSink* audio_renderer_sink,
128 media::MessageLoopFactory* message_loop_factory, 128 media::MessageLoopFactory* message_loop_factory,
129 webkit_media::MediaStreamClient* media_stream_client, 129 webkit_media::MediaStreamClient* media_stream_client,
130 bool encrypted_media_enabled,
130 media::MediaLog* media_log); 131 media::MediaLog* media_log);
131 132
132 // Returns true if the renderer process should schedule the idle handler when 133 // Returns true if the renderer process should schedule the idle handler when
133 // all widgets are hidden. 134 // all widgets are hidden.
134 virtual bool RunIdleHandlerWhenWidgetsHidden(); 135 virtual bool RunIdleHandlerWhenWidgetsHidden();
135 136
136 // Returns true if the given url can create popup windows. 137 // Returns true if the given url can create popup windows.
137 virtual bool AllowPopup(const GURL& creator); 138 virtual bool AllowPopup(const GURL& creator);
138 139
139 // Returns true if the navigation was handled by the embedder and should be 140 // Returns true if the navigation was handled by the embedder and should be
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 const GURL& first_party_for_cookies, 194 const GURL& first_party_for_cookies,
194 const std::string& value); 195 const std::string& value);
195 196
196 virtual void RegisterPPAPIInterfaceFactories( 197 virtual void RegisterPPAPIInterfaceFactories(
197 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {} 198 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {}
198 }; 199 };
199 200
200 } // namespace content 201 } // namespace content
201 202
202 #endif // CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_ 203 #endif // CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698