| Index: content/browser/renderer_host/media/media_stream_dispatcher_host.h
|
| diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.h b/content/browser/renderer_host/media/media_stream_dispatcher_host.h
|
| index 088154bc693f79830a964e7d551bea3499313bbc..65343a33b6b3bf7147cb4165e37a81a4f61afb28 100644
|
| --- a/content/browser/renderer_host/media/media_stream_dispatcher_host.h
|
| +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.h
|
| @@ -17,6 +17,10 @@
|
| #include "content/public/browser/browser_message_filter.h"
|
| #include "content/public/browser/resource_context.h"
|
|
|
| +namespace url {
|
| +class Origin;
|
| +}
|
| +
|
| namespace content {
|
|
|
| class MediaStreamManager;
|
| @@ -69,7 +73,7 @@ class CONTENT_EXPORT MediaStreamDispatcherHost : public BrowserMessageFilter,
|
| void OnGenerateStream(int render_frame_id,
|
| int page_request_id,
|
| const StreamControls& controls,
|
| - const GURL& security_origin,
|
| + const url::Origin& security_origin,
|
| bool user_gesture);
|
| void OnCancelGenerateStream(int render_frame_id,
|
| int page_request_id);
|
| @@ -79,7 +83,7 @@ class CONTENT_EXPORT MediaStreamDispatcherHost : public BrowserMessageFilter,
|
| void OnEnumerateDevices(int render_frame_id,
|
| int page_request_id,
|
| MediaStreamType type,
|
| - const GURL& security_origin);
|
| + const url::Origin& security_origin);
|
|
|
| void OnCancelEnumerateDevices(int render_frame_id,
|
| int page_request_id);
|
| @@ -88,7 +92,7 @@ class CONTENT_EXPORT MediaStreamDispatcherHost : public BrowserMessageFilter,
|
| int page_request_id,
|
| const std::string& device_id,
|
| MediaStreamType type,
|
| - const GURL& security_origin);
|
| + const url::Origin& security_origin);
|
|
|
| void OnCloseDevice(int render_frame_id,
|
| const std::string& label);
|
| @@ -97,8 +101,6 @@ class CONTENT_EXPORT MediaStreamDispatcherHost : public BrowserMessageFilter,
|
| int page_request_id,
|
| const std::string& label);
|
|
|
| - bool IsURLAllowed(const GURL& url);
|
| -
|
| int render_process_id_;
|
| ResourceContext::SaltCallback salt_callback_;
|
| MediaStreamManager* media_stream_manager_;
|
|
|