summaryrefslogtreecommitdiffstats
path: root/chrome/browser/media/desktop_streams_registry.h
diff options
context:
space:
mode:
authorjiayl@chromium.org <jiayl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-07 11:27:35 +0000
committerjiayl@chromium.org <jiayl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-07 11:27:35 +0000
commit3e172022b280f75f7bb9cc43d7d798515b63211a (patch)
treea5511bad2aa92482cbe0a024f1918b3df69780a1 /chrome/browser/media/desktop_streams_registry.h
parentb8db097908d89791a91c2fa38299c700b2dd0d32 (diff)
downloadchromium_src-3e172022b280f75f7bb9cc43d7d798515b63211a.zip
chromium_src-3e172022b280f75f7bb9cc43d7d798515b63211a.tar.gz
chromium_src-3e172022b280f75f7bb9cc43d7d798515b63211a.tar.bz2
Adds extension name to the screencast notification bar.
Also adds the web content origin to the window picker text. No change to both text if the extension itself is requesting the stream, instead of sharing it with a tab. Screen sharing without window picker (i.e. chromeMediaSource:screen) is not affected. BUG=341729 Review URL: https://codereview.chromium.org/186133005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/media/desktop_streams_registry.h')
-rw-r--r--chrome/browser/media/desktop_streams_registry.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/media/desktop_streams_registry.h b/chrome/browser/media/desktop_streams_registry.h
index f2735ae..90fb365 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;