diff options
| author | macourteau@chromium.org <macourteau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 09:11:08 +0000 |
|---|---|---|
| committer | macourteau@chromium.org <macourteau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 09:11:08 +0000 |
| commit | 117b6b41e33888659ab6f13abb65940311e21dc0 (patch) | |
| tree | c08ef501eeeeb9c8b3bab8acb217573ae4d6d037 /content/public | |
| parent | fd13a710033639865dbbae8922a85a222046454d (diff) | |
| download | chromium_src-117b6b41e33888659ab6f13abb65940311e21dc0.zip chromium_src-117b6b41e33888659ab6f13abb65940311e21dc0.tar.gz chromium_src-117b6b41e33888659ab6f13abb65940311e21dc0.tar.bz2 | |
Adding a new InfoBar that will be displayed when a webpage requests access to
the user's video camera or microphone (via WebRTC).
BUG=105115
TEST=
Review URL: http://codereview.chromium.org/9463025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124159 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public')
| -rw-r--r-- | content/public/browser/content_browser_client.h | 2 | ||||
| -rw-r--r-- | content/public/common/media_stream_request.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h index a6adede..d848406 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -66,7 +66,7 @@ class BrowserContext; class ResourceContext; class WebUIControllerFactory; -typedef base::Callback< void(const content::MediaStreamDeviceArray&) > +typedef base::Callback< void(const content::MediaStreamDevices&) > MediaResponseCallback; // Embedder API (or SPI) for participating in browser logic, to be implemented diff --git a/content/public/common/media_stream_request.h b/content/public/common/media_stream_request.h index 7a5eceb..df9ce4e 100644 --- a/content/public/common/media_stream_request.h +++ b/content/public/common/media_stream_request.h @@ -39,9 +39,9 @@ struct CONTENT_EXPORT MediaStreamDevice { std::string name; }; -typedef std::vector<MediaStreamDevice> MediaStreamDeviceArray; +typedef std::vector<MediaStreamDevice> MediaStreamDevices; -typedef std::map<MediaStreamDeviceType, MediaStreamDeviceArray> +typedef std::map<MediaStreamDeviceType, MediaStreamDevices> MediaStreamDeviceMap; // Represents a request for media streams (audio/video). |