| Index: chrome/browser/media/media_stream_capture_indicator.h
|
| diff --git a/chrome/browser/media/media_stream_capture_indicator.h b/chrome/browser/media/media_stream_capture_indicator.h
|
| index 9acf9775cf895ff8b23315b6bb466b86e8e962bd..e493f6f048a55c33e8a44b92b15777945110349e 100644
|
| --- a/chrome/browser/media/media_stream_capture_indicator.h
|
| +++ b/chrome/browser/media/media_stream_capture_indicator.h
|
| @@ -54,13 +54,13 @@ class MediaStreamCaptureIndicator
|
| int render_view_id,
|
| const content::MediaStreamDevices& devices);
|
|
|
| - // Returns true if the render view is capturing user media (e.g., webcam
|
| - // or microphone input).
|
| - bool IsCapturingUserMedia(int render_process_id, int render_view_id) const;
|
| + // Returns true if the |web_contents| is capturing user media (e.g., webcam or
|
| + // microphone input).
|
| + bool IsCapturingUserMedia(content::WebContents* web_contents) const;
|
|
|
| - // Returns true if the render view itself is being mirrored (e.g., a source of
|
| - // media for remote broadcast).
|
| - bool IsBeingMirrored(int render_process_id, int render_view_id) const;
|
| + // Returns true if the |web_contents| itself is being mirrored (e.g., a source
|
| + // of media for remote broadcast).
|
| + bool IsBeingMirrored(content::WebContents* web_contents) const;
|
|
|
| private:
|
| class WebContentsDeviceUsage;
|
| @@ -68,15 +68,6 @@ class MediaStreamCaptureIndicator
|
| friend class base::RefCountedThreadSafe<MediaStreamCaptureIndicator>;
|
| virtual ~MediaStreamCaptureIndicator();
|
|
|
| - // Called by the public functions, executed on UI thread.
|
| - void DoDevicesOpenedOnUIThread(int render_process_id,
|
| - int render_view_id,
|
| - const content::MediaStreamDevices& devices,
|
| - const base::Closure& close_callback);
|
| - void DoDevicesClosedOnUIThread(int render_process_id,
|
| - int render_view_id,
|
| - const content::MediaStreamDevices& devices);
|
| -
|
| // Following functions/variables are executed/accessed only on UI thread.
|
|
|
| // Creates and shows the status tray icon if it has not been created and is
|
|
|