content/renderer/media/media_stream_center.cc - Issue 16408017: Use a direct include of utf_string_conversions.h in content/.

Side by Side Diff

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

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

Side by Side Diff: content/renderer/media/media_stream_center.cc

Issue 16408017: Use a direct include of utf_string_conversions.h in content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « content/renderer/input_tag_speech_dispatcher.cc ('k') | content/renderer/media/media_stream_dependency_factory.cc » ('j') | no next file with comments »

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 "content/renderer/media/media_stream_center.h"	5 #include "content/renderer/media/media_stream_center.h"

6	6

7 #include <string>	7 #include <string>

8	8

9 #include "base/logging.h"	9 #include "base/logging.h"

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

11 #include "base/string_number_conversions.h"	11 #include "base/string_number_conversions.h"

12 #include "base/utf_string_conversions.h"	12 #include "base/strings/utf_string_conversions.h"

13 #include "content/renderer/media/media_stream_dependency_factory.h"	13 #include "content/renderer/media/media_stream_dependency_factory.h"

14 #include "content/renderer/media/media_stream_extra_data.h"	14 #include "content/renderer/media/media_stream_extra_data.h"

15 #include "content/renderer/media/media_stream_impl.h"	15 #include "content/renderer/media/media_stream_impl.h"

16 #include "content/renderer/render_view_impl.h"	16 #include "content/renderer/render_view_impl.h"

17 #include "third_party/WebKit/public/platform/WebMediaStream.h"	17 #include "third_party/WebKit/public/platform/WebMediaStream.h"

18 #include "third_party/WebKit/public/platform/WebMediaStreamCenterClient.h"	18 #include "third_party/WebKit/public/platform/WebMediaStreamCenterClient.h"

19 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"	19 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"

20 #include "third_party/WebKit/public/platform/WebMediaStreamSourcesRequest.h"	20 #include "third_party/WebKit/public/platform/WebMediaStreamSourcesRequest.h"

21 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"	21 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"

22 #include "third_party/WebKit/public/platform/WebVector.h"	22 #include "third_party/WebKit/public/platform/WebVector.h"

(...skipping 87 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
110 bool MediaStreamCenter::didRemoveMediaStreamTrack(	110 bool MediaStreamCenter::didRemoveMediaStreamTrack(

111 const WebKit::WebMediaStream& stream,	111 const WebKit::WebMediaStream& stream,

112 const WebKit::WebMediaStreamTrack& track) {	112 const WebKit::WebMediaStreamTrack& track) {

113 if (!rtc_factory_)	113 if (!rtc_factory_)

114 return false;	114 return false;

115	115

116 return rtc_factory_->RemoveNativeMediaStreamTrack(stream, track);	116 return rtc_factory_->RemoveNativeMediaStreamTrack(stream, track);

117 }	117 }

118	118

119 } // namespace content	119 } // namespace content

OLD	NEW