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

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

Issue 887873003: media: Add DefaultMediaPermission. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 5 years, 10 months 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 <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 struct WebTransitionElementData; 61 struct WebTransitionElementData;
62 } 62 }
63 63
64 namespace gfx { 64 namespace gfx {
65 class Point; 65 class Point;
66 class Range; 66 class Range;
67 class Rect; 67 class Rect;
68 } 68 }
69 69
70 namespace media { 70 namespace media {
71 class MediaPermission;
71 class WebEncryptedMediaClientImpl; 72 class WebEncryptedMediaClientImpl;
72 } 73 }
73 74
74 namespace content { 75 namespace content {
75 76
76 class ChildFrameCompositingHelper; 77 class ChildFrameCompositingHelper;
77 class CompositorDependencies; 78 class CompositorDependencies;
78 class ExternalPopupMenu; 79 class ExternalPopupMenu;
79 class GeolocationDispatcher; 80 class GeolocationDispatcher;
80 class ManifestManager; 81 class ManifestManager;
(...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
713 // of the WebURLRequest. 714 // of the WebURLRequest.
714 void BeginNavigation(blink::WebURLRequest* request); 715 void BeginNavigation(blink::WebURLRequest* request);
715 716
716 // Returns the URL being loaded by the |frame_|'s request. 717 // Returns the URL being loaded by the |frame_|'s request.
717 GURL GetLoadingUrl() const; 718 GURL GetLoadingUrl() const;
718 719
719 #if defined(OS_ANDROID) 720 #if defined(OS_ANDROID)
720 blink::WebMediaPlayer* CreateAndroidWebMediaPlayer( 721 blink::WebMediaPlayer* CreateAndroidWebMediaPlayer(
721 const blink::WebURL& url, 722 const blink::WebURL& url,
722 blink::WebMediaPlayerClient* client, 723 blink::WebMediaPlayerClient* client,
724 media::MediaPermission* media_permission,
723 blink::WebContentDecryptionModule* initial_cdm); 725 blink::WebContentDecryptionModule* initial_cdm);
724 726
725 RendererMediaPlayerManager* GetMediaPlayerManager(); 727 RendererMediaPlayerManager* GetMediaPlayerManager();
726 #endif 728 #endif
727 729
728 #if defined(ENABLE_BROWSER_CDMS) 730 #if defined(ENABLE_BROWSER_CDMS)
729 RendererCdmManager* GetCdmManager(); 731 RendererCdmManager* GetCdmManager();
730 #endif 732 #endif
731 733
732 // Stores the WebLocalFrame we are associated with. 734 // Stores the WebLocalFrame we are associated with.
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
872 #endif 874 #endif
873 875
874 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 876 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
875 877
876 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 878 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
877 }; 879 };
878 880
879 } // namespace content 881 } // namespace content
880 882
881 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 883 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698