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

Unified Diff: content/browser/renderer_host/media/media_stream_dispatcher_host.h

Issue 1928493002: Use url::Origin to represent security origins in MediaStream-related code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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/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_;

Powered by Google App Engine
This is Rietveld 408576698