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

Side by Side Diff: content/renderer/render_frame_impl.h

Issue 1470233002: media: Generalize MediaPermissionDispatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_RENDERER_RENDER_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 869 matching lines...) Expand 10 before | Expand all | Expand 10 after
880 media::interfaces::ServiceFactory* GetMediaServiceFactory(); 880 media::interfaces::ServiceFactory* GetMediaServiceFactory();
881 881
882 // Called when a connection error happened on |media_service_factory_|. 882 // Called when a connection error happened on |media_service_factory_|.
883 void OnMediaServiceFactoryConnectionError(); 883 void OnMediaServiceFactoryConnectionError();
884 #endif 884 #endif
885 885
886 media::CdmFactory* GetCdmFactory(); 886 media::CdmFactory* GetCdmFactory();
887 887
888 void RegisterMojoServices(); 888 void RegisterMojoServices();
889 889
890 // Connect to an interface provided by the service registry.
891 template <typename Interface>
892 void ConnectToService(mojo::InterfaceRequest<Interface> request);
893
890 // Connects to a Mojo application and returns a proxy to its exposed 894 // Connects to a Mojo application and returns a proxy to its exposed
891 // ServiceProvider. 895 // ServiceProvider.
892 mojo::ServiceProviderPtr ConnectToApplication(const GURL& url); 896 mojo::ServiceProviderPtr ConnectToApplication(const GURL& url);
893 897
894 // Returns the media delegate for WebMediaPlayer usage. If 898 // Returns the media delegate for WebMediaPlayer usage. If
895 // |media_player_delegate_| is NULL, one is created. 899 // |media_player_delegate_| is NULL, one is created.
896 media::RendererWebMediaPlayerDelegate* GetWebMediaPlayerDelegate(); 900 media::RendererWebMediaPlayerDelegate* GetWebMediaPlayerDelegate();
897 901
898 // Stores the WebLocalFrame we are associated with. This is null from the 902 // Stores the WebLocalFrame we are associated with. This is null from the
899 // constructor until SetWebFrame is called, and it is null after 903 // constructor until SetWebFrame is called, and it is null after
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
988 992
989 // Dispatches permission requests for Web Notifications. 993 // Dispatches permission requests for Web Notifications.
990 NotificationPermissionDispatcher* notification_permission_dispatcher_; 994 NotificationPermissionDispatcher* notification_permission_dispatcher_;
991 995
992 // Destroyed via the RenderFrameObserver::OnDestruct() mechanism. 996 // Destroyed via the RenderFrameObserver::OnDestruct() mechanism.
993 UserMediaClientImpl* web_user_media_client_; 997 UserMediaClientImpl* web_user_media_client_;
994 998
995 // EncryptedMediaClient attached to this frame; lazily initialized. 999 // EncryptedMediaClient attached to this frame; lazily initialized.
996 scoped_ptr<media::WebEncryptedMediaClientImpl> web_encrypted_media_client_; 1000 scoped_ptr<media::WebEncryptedMediaClientImpl> web_encrypted_media_client_;
997 1001
998 // The media permission dispatcher attached to this frame, lazily initialized. 1002 // The media permission dispatcher attached to this frame.
999 MediaPermissionDispatcher* media_permission_dispatcher_; 1003 scoped_ptr<MediaPermissionDispatcher> media_permission_dispatcher_;
xhwang 2015/11/24 08:28:05 We don't care about any Frame events. So using a s
nasko 2015/11/25 15:04:27 Makes sense to me. I now wonder why it was an obse
1000 1004
1001 #if defined(ENABLE_MOJO_MEDIA) 1005 #if defined(ENABLE_MOJO_MEDIA)
1002 // The media factory attached to this frame, lazily initialized. 1006 // The media factory attached to this frame, lazily initialized.
1003 media::interfaces::ServiceFactoryPtr media_service_factory_; 1007 media::interfaces::ServiceFactoryPtr media_service_factory_;
1004 #endif 1008 #endif
1005 1009
1006 // MidiClient attached to this frame; lazily initialized. 1010 // MidiClient attached to this frame; lazily initialized.
1007 MidiDispatcher* midi_dispatcher_; 1011 MidiDispatcher* midi_dispatcher_;
1008 1012
1009 #if defined(OS_ANDROID) 1013 #if defined(OS_ANDROID)
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
1095 #endif 1099 #endif
1096 1100
1097 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1101 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1098 1102
1099 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1103 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1100 }; 1104 };
1101 1105
1102 } // namespace content 1106 } // namespace content
1103 1107
1104 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1108 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698