OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/tabs/tab_utils.h" | 5 #include "chrome/browser/ui/tabs/tab_utils.h" |
6 | 6 |
7 #include "chrome/browser/media/media_internals.h" | 7 #include "chrome/browser/media/media_internals.h" |
8 #include "chrome/browser/media/media_stream_capture_indicator.h" | 8 #include "chrome/browser/media/media_stream_capture_indicator.h" |
9 #include "content/public/browser/render_process_host.h" | 9 #include "content/public/browser/render_process_host.h" |
10 #include "content/public/browser/render_view_host.h" | 10 #include "content/public/browser/render_view_host.h" |
11 #include "content/public/browser/web_contents.h" | 11 #include "content/public/browser/web_contents.h" |
12 | 12 |
13 namespace chrome { | 13 namespace chrome { |
14 | 14 |
15 bool ShouldShowProjectingIndicator(content::WebContents* contents) { | 15 bool ShouldShowProjectingIndicator(content::WebContents* contents) { |
16 int render_process_id = contents->GetRenderProcessHost()->GetID(); | 16 int render_process_id = contents->GetRenderProcessHost()->GetID(); |
17 int render_view_id = contents->GetRenderViewHost()->GetRoutingID(); | 17 int render_view_id = contents->GetRenderViewHost()->GetRoutingID(); |
18 scoped_refptr<MediaStreamCaptureIndicator> capture_indicator = | 18 scoped_refptr<MediaStreamCaptureIndicator> indicator = |
19 MediaInternals::GetInstance()->GetMediaStreamCaptureIndicator(); | 19 MediaInternals::GetInstance()->GetMediaStreamCaptureIndicator(); |
20 return capture_indicator->IsProcessCapturingTab(render_process_id, | 20 return indicator->IsSupplyingMirroredMedia(render_process_id, render_view_id); |
21 render_view_id); | |
22 } | 21 } |
23 | 22 |
24 bool ShouldShowRecordingIndicator(content::WebContents* contents) { | 23 bool ShouldShowRecordingIndicator(content::WebContents* contents) { |
25 int render_process_id = contents->GetRenderProcessHost()->GetID(); | 24 int render_process_id = contents->GetRenderProcessHost()->GetID(); |
26 int render_view_id = contents->GetRenderViewHost()->GetRoutingID(); | 25 int render_view_id = contents->GetRenderViewHost()->GetRoutingID(); |
27 scoped_refptr<MediaStreamCaptureIndicator> capture_indicator = | 26 scoped_refptr<MediaStreamCaptureIndicator> indicator = |
28 MediaInternals::GetInstance()->GetMediaStreamCaptureIndicator(); | 27 MediaInternals::GetInstance()->GetMediaStreamCaptureIndicator(); |
29 // The projecting indicator takes precedence over the recording indicator, but | 28 // The projecting indicator takes precedence over the recording indicator, but |
30 // if we are projecting and we don't handle the projecting case we want to | 29 // if we are projecting and we don't handle the projecting case we want to |
31 // still show the recording indicator. | 30 // still show the recording indicator. |
32 return capture_indicator->IsProcessCapturing(render_process_id, | 31 return indicator->IsCapturingUserMedia(render_process_id, render_view_id) || |
33 render_view_id) || | 32 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
| |
34 capture_indicator->IsProcessCapturingTab(render_process_id, | |
35 render_view_id); | |
36 } | 33 } |
37 | 34 |
38 } // namespace chrome | 35 } // namespace chrome |
OLD | NEW |