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

Unified Diff: content/renderer/pepper/pepper_media_device_manager.h

Issue 364123002: [Cross-Site Isolation] Migrate entire MediaStream verticals to be per-RenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: TabCaptureRegistry: Keep track of original target RenderFrameHost, for OnRequestUpdate(). Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/pepper/pepper_media_device_manager.h
diff --git a/content/renderer/pepper/pepper_media_device_manager.h b/content/renderer/pepper/pepper_media_device_manager.h
index 6fa7d7a044b7d6807482b18091693b1c3e12fc7c..086ffbcc9335b4a6a3ca49d196ac19a271199951 100644
--- a/content/renderer/pepper/pepper_media_device_manager.h
+++ b/content/renderer/pepper/pepper_media_device_manager.h
@@ -8,22 +8,22 @@
#include <map>
#include "base/memory/weak_ptr.h"
+#include "content/public/renderer/render_frame_observer.h"
+#include "content/public/renderer/render_frame_observer_tracker.h"
#include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
#include "content/renderer/pepper/pepper_device_enumeration_host_helper.h"
-#include "content/public/renderer/render_view_observer_tracker.h"
-#include "content/public/renderer/render_view_observer.h"
namespace content {
-class RenderViewImpl;
+class MediaStreamDispatcher;
class PepperMediaDeviceManager
: public MediaStreamDispatcherEventHandler,
public PepperDeviceEnumerationHostHelper::Delegate,
- public RenderViewObserver,
- public RenderViewObserverTracker<PepperMediaDeviceManager>,
+ public RenderFrameObserver,
+ public RenderFrameObserverTracker<PepperMediaDeviceManager>,
public base::SupportsWeakPtr<PepperMediaDeviceManager> {
public:
- static PepperMediaDeviceManager* GetForRenderView(RenderView* render_view);
+ static PepperMediaDeviceManager* GetForRenderFrame(RenderFrame* render_frame);
virtual ~PepperMediaDeviceManager();
// PepperDeviceEnumerationHostHelper::Delegate implementation:
@@ -78,13 +78,14 @@ class PepperMediaDeviceManager
static PP_DeviceType_Dev FromMediaStreamType(MediaStreamType type);
private:
- PepperMediaDeviceManager(RenderView* render_view);
+ explicit PepperMediaDeviceManager(RenderFrame* render_frame);
void NotifyDeviceOpened(int request_id,
bool succeeded,
const std::string& label);
- RenderViewImpl* GetRenderViewImpl();
+
+ MediaStreamDispatcher* GetMediaStreamDispatcher() const;
int next_id_;

Powered by Google App Engine
This is Rietveld 408576698