chrome/browser/ui/tabs/tab_utils.cc - Issue 12153002: Move chrome://media-internals to content. This allows us to hide implementation details from the pu…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/tabs/tab_utils.cc

Issue 12153002: Move chrome://media-internals to content. This allows us to hide implementation details from the pu… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc ('K') | « chrome/browser/ui/extensions/shell_window.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | content/browser/renderer_host/media/mock_media_observer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/tabs/tab_utils.cc

===================================================================

--- chrome/browser/ui/tabs/tab_utils.cc (revision 179909)

+++ chrome/browser/ui/tabs/tab_utils.cc (working copy)

@@ -4,7 +4,7 @@

#include "chrome/browser/ui/tabs/tab_utils.h"

-#include "chrome/browser/media/media_internals.h"

+#include "chrome/browser/media/media_capture_devices_dispatcher.h"

#include "chrome/browser/media/media_stream_capture_indicator.h"

#include "content/public/browser/render_process_host.h"

#include "content/public/browser/render_view_host.h"

@@ -16,7 +16,8 @@

int render_process_id = contents->GetRenderProcessHost()->GetID();

int render_view_id = contents->GetRenderViewHost()->GetRoutingID();

scoped_refptr<MediaStreamCaptureIndicator> indicator =

- MediaInternals::GetInstance()->GetMediaStreamCaptureIndicator();

+ MediaCaptureDevicesDispatcher::GetInstance()->

+ GetMediaStreamCaptureIndicator();

return indicator->IsBeingMirrored(render_process_id, render_view_id);

}

@@ -24,7 +25,8 @@

int render_process_id = contents->GetRenderProcessHost()->GetID();

int render_view_id = contents->GetRenderViewHost()->GetRoutingID();

scoped_refptr<MediaStreamCaptureIndicator> indicator =

- MediaInternals::GetInstance()->GetMediaStreamCaptureIndicator();

+ MediaCaptureDevicesDispatcher::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.