| Index: chrome/browser/media/desktop_streams_registry.h
|
| diff --git a/chrome/browser/media/desktop_streams_registry.h b/chrome/browser/media/desktop_streams_registry.h
|
| index f2735ae71f61de0c32ba2c2cf5ca6d40c8bc72b9..90fb3651722c442879baaf395f7d9ae01c49ad60 100644
|
| --- a/chrome/browser/media/desktop_streams_registry.h
|
| +++ b/chrome/browser/media/desktop_streams_registry.h
|
| @@ -25,7 +25,8 @@ class DesktopStreamsRegistry {
|
| std::string RegisterStream(int render_process_id,
|
| int render_view_id,
|
| const GURL& origin,
|
| - const content::DesktopMediaID& source);
|
| + const content::DesktopMediaID& source,
|
| + const std::string& extension_name);
|
|
|
| // Validates stream identifier specified in getUserMedia(). Returns null
|
| // DesktopMediaID if the specified |id| is invalid, i.e. wasn't generated
|
| @@ -34,15 +35,19 @@ class DesktopStreamsRegistry {
|
| content::DesktopMediaID RequestMediaForStreamId(const std::string& id,
|
| int render_process_id,
|
| int render_view_id,
|
| - const GURL& origin);
|
| + const GURL& origin,
|
| + std::string* extension_name);
|
|
|
| private:
|
| // Type used to store list of accepted desktop media streams.
|
| struct ApprovedDesktopMediaStream {
|
| + ApprovedDesktopMediaStream();
|
| +
|
| int render_process_id;
|
| int render_view_id;
|
| GURL origin;
|
| content::DesktopMediaID source;
|
| + std::string extension_name;
|
| };
|
| typedef std::map<std::string, ApprovedDesktopMediaStream> StreamsMap;
|
|
|
|
|