diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-30 01:53:31 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-30 01:53:31 +0000 |
| commit | ef663b9bc5247cdf25e26905d19373acc01cc927 (patch) | |
| tree | ff0d72d80eea61ad0109b54c26757c6386683692 /content/content_browser.gypi | |
| parent | 34648fbef750a12e1a931992a2254c64dc4b9334 (diff) | |
| download | chromium_src-ef663b9bc5247cdf25e26905d19373acc01cc927.zip chromium_src-ef663b9bc5247cdf25e26905d19373acc01cc927.tar.gz chromium_src-ef663b9bc5247cdf25e26905d19373acc01cc927.tar.bz2 | |
Replace MediaStreamUIController with MediaStreamUIProxy.
Previously a single object MediaStreamUIController was used to control UI for
all streams. Replaced it with a per-stream MediaStreamUIProxy that simplifies
code in many places.
Also moved media request queueing logic from content layer to chrome. Now
different types of requests may be queued differently (e.g. there is no
reason to block screen capture requests on webcam infobar).
TBR=tommi@chromium.org
Review URL: https://codereview.chromium.org/13989003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197222 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_browser.gypi')
| -rw-r--r-- | content/content_browser.gypi | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/content/content_browser.gypi b/content/content_browser.gypi index f76c986..28fe7ed 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -731,9 +731,8 @@ 'browser/renderer_host/media/media_stream_manager.h', 'browser/renderer_host/media/media_stream_provider.h', 'browser/renderer_host/media/media_stream_requester.h', - 'browser/renderer_host/media/media_stream_settings_requester.h', - 'browser/renderer_host/media/media_stream_ui_controller.cc', - 'browser/renderer_host/media/media_stream_ui_controller.h', + 'browser/renderer_host/media/media_stream_ui_proxy.cc', + 'browser/renderer_host/media/media_stream_ui_proxy.h', 'browser/renderer_host/media/video_capture_buffer_pool.cc', 'browser/renderer_host/media/video_capture_buffer_pool.h', 'browser/renderer_host/media/video_capture_controller.cc', |