Chromium Code Reviews| Index: chrome/browser/ui/tabs/tab_utils.cc |
| diff --git a/chrome/browser/ui/tabs/tab_utils.cc b/chrome/browser/ui/tabs/tab_utils.cc |
| index 93609fe822f8ef7a55997f481f0bb04c00e7072b..f3f8d03ab5daa31389b8603ac4f2f58b5beba7dd 100644 |
| --- a/chrome/browser/ui/tabs/tab_utils.cc |
| +++ b/chrome/browser/ui/tabs/tab_utils.cc |
| @@ -15,24 +15,21 @@ namespace chrome { |
| bool ShouldShowProjectingIndicator(content::WebContents* contents) { |
| int render_process_id = contents->GetRenderProcessHost()->GetID(); |
| int render_view_id = contents->GetRenderViewHost()->GetRoutingID(); |
| - scoped_refptr<MediaStreamCaptureIndicator> capture_indicator = |
| + scoped_refptr<MediaStreamCaptureIndicator> indicator = |
| MediaInternals::GetInstance()->GetMediaStreamCaptureIndicator(); |
| - return capture_indicator->IsProcessCapturingTab(render_process_id, |
| - render_view_id); |
| + return indicator->IsSupplyingMirroredMedia(render_process_id, render_view_id); |
| } |
| bool ShouldShowRecordingIndicator(content::WebContents* contents) { |
| int render_process_id = contents->GetRenderProcessHost()->GetID(); |
| int render_view_id = contents->GetRenderViewHost()->GetRoutingID(); |
| - scoped_refptr<MediaStreamCaptureIndicator> capture_indicator = |
| + scoped_refptr<MediaStreamCaptureIndicator> indicator = |
| MediaInternals::GetInstance()->GetMediaStreamCaptureIndicator(); |
| // The projecting indicator takes precedence over the recording indicator, but |
| // if we are projecting and we don't handle the projecting case we want to |
| // still show the recording indicator. |
| - return capture_indicator->IsProcessCapturing(render_process_id, |
| - render_view_id) || |
| - capture_indicator->IsProcessCapturingTab(render_process_id, |
| - render_view_id); |
| + return indicator->IsCapturingUserMedia(render_process_id, render_view_id) || |
| + indicator->IsSupplyingMirroredMedia(render_process_id, render_view_id); |
|
justinlin
2013/01/24 07:04:44
nit: I think I kind of prefer just something "IsMi
miu
2013/01/28 19:36:52
Okay. How about "IsBeingMirrored?" I want to lea
justinlin
2013/01/28 22:31:21
SGTM
|
| } |
| } // namespace chrome |