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

Side by Side 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, 7 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "content/browser/renderer_host/media/media_stream_manager.h" 13 #include "content/browser/renderer_host/media/media_stream_manager.h"
14 #include "content/browser/renderer_host/media/media_stream_requester.h" 14 #include "content/browser/renderer_host/media/media_stream_requester.h"
15 #include "content/common/content_export.h" 15 #include "content/common/content_export.h"
16 #include "content/common/media/media_stream_options.h" 16 #include "content/common/media/media_stream_options.h"
17 #include "content/public/browser/browser_message_filter.h" 17 #include "content/public/browser/browser_message_filter.h"
18 #include "content/public/browser/resource_context.h" 18 #include "content/public/browser/resource_context.h"
19 19
20 namespace url {
21 class Origin;
22 }
23
20 namespace content { 24 namespace content {
21 25
22 class MediaStreamManager; 26 class MediaStreamManager;
23 class ResourceContext; 27 class ResourceContext;
24 28
25 // MediaStreamDispatcherHost is a delegate for Media Stream API messages used by 29 // MediaStreamDispatcherHost is a delegate for Media Stream API messages used by
26 // MediaStreamImpl. There is one MediaStreamDispatcherHost per 30 // MediaStreamImpl. There is one MediaStreamDispatcherHost per
27 // RenderProcessHost, the former owned by the latter. 31 // RenderProcessHost, the former owned by the latter.
28 class CONTENT_EXPORT MediaStreamDispatcherHost : public BrowserMessageFilter, 32 class CONTENT_EXPORT MediaStreamDispatcherHost : public BrowserMessageFilter,
29 public MediaStreamRequester { 33 public MediaStreamRequester {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 66
63 protected: 67 protected:
64 ~MediaStreamDispatcherHost() override; 68 ~MediaStreamDispatcherHost() override;
65 69
66 private: 70 private:
67 friend class MockMediaStreamDispatcherHost; 71 friend class MockMediaStreamDispatcherHost;
68 72
69 void OnGenerateStream(int render_frame_id, 73 void OnGenerateStream(int render_frame_id,
70 int page_request_id, 74 int page_request_id,
71 const StreamControls& controls, 75 const StreamControls& controls,
72 const GURL& security_origin, 76 const url::Origin& security_origin,
73 bool user_gesture); 77 bool user_gesture);
74 void OnCancelGenerateStream(int render_frame_id, 78 void OnCancelGenerateStream(int render_frame_id,
75 int page_request_id); 79 int page_request_id);
76 void OnStopStreamDevice(int render_frame_id, 80 void OnStopStreamDevice(int render_frame_id,
77 const std::string& device_id); 81 const std::string& device_id);
78 82
79 void OnEnumerateDevices(int render_frame_id, 83 void OnEnumerateDevices(int render_frame_id,
80 int page_request_id, 84 int page_request_id,
81 MediaStreamType type, 85 MediaStreamType type,
82 const GURL& security_origin); 86 const url::Origin& security_origin);
83 87
84 void OnCancelEnumerateDevices(int render_frame_id, 88 void OnCancelEnumerateDevices(int render_frame_id,
85 int page_request_id); 89 int page_request_id);
86 90
87 void OnOpenDevice(int render_frame_id, 91 void OnOpenDevice(int render_frame_id,
88 int page_request_id, 92 int page_request_id,
89 const std::string& device_id, 93 const std::string& device_id,
90 MediaStreamType type, 94 MediaStreamType type,
91 const GURL& security_origin); 95 const url::Origin& security_origin);
92 96
93 void OnCloseDevice(int render_frame_id, 97 void OnCloseDevice(int render_frame_id,
94 const std::string& label); 98 const std::string& label);
95 99
96 void StoreRequest(int render_frame_id, 100 void StoreRequest(int render_frame_id,
97 int page_request_id, 101 int page_request_id,
98 const std::string& label); 102 const std::string& label);
99 103
100 bool IsURLAllowed(const GURL& url);
101
102 int render_process_id_; 104 int render_process_id_;
103 ResourceContext::SaltCallback salt_callback_; 105 ResourceContext::SaltCallback salt_callback_;
104 MediaStreamManager* media_stream_manager_; 106 MediaStreamManager* media_stream_manager_;
105 107
106 DISALLOW_COPY_AND_ASSIGN(MediaStreamDispatcherHost); 108 DISALLOW_COPY_AND_ASSIGN(MediaStreamDispatcherHost);
107 }; 109 };
108 110
109 } // namespace content 111 } // namespace content
110 112
111 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_ 113 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698