webkit/renderer/media/android/media_source_delegate.cc - Issue 16514006: Update includes of message_loop_proxy.

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: webkit/renderer/media/android/media_source_delegate.cc

Issue 16514006: Update includes of message_loop_proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 "webkit/renderer/media/android/media_source_delegate.h"	5 #include "webkit/renderer/media/android/media_source_delegate.h"

6	6

7 #include "base/message_loop_proxy.h"	7 #include "base/message_loop/message_loop_proxy.h"

8 #include "base/strings/string_number_conversions.h"	8 #include "base/strings/string_number_conversions.h"

9 #include "media/base/android/demuxer_stream_player_params.h"	9 #include "media/base/android/demuxer_stream_player_params.h"

10 #include "media/base/bind_to_loop.h"	10 #include "media/base/bind_to_loop.h"

11 #include "media/base/demuxer_stream.h"	11 #include "media/base/demuxer_stream.h"

12 #include "media/base/media_log.h"	12 #include "media/base/media_log.h"

13 #include "media/filters/chunk_demuxer.h"	13 #include "media/filters/chunk_demuxer.h"

14 #include "third_party/WebKit/public/platform/WebString.h"	14 #include "third_party/WebKit/public/platform/WebString.h"

15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaSource.h"	15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaSource.h"

16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"	16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"

17 #include "webkit/renderer/media/android/webmediaplayer_proxy_android.h"	17 #include "webkit/renderer/media/android/webmediaplayer_proxy_android.h"

(...skipping 386 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
404 }	404 }

405	405

406 scoped_ptr<media::TextTrack> MediaSourceDelegate::OnAddTextTrack(	406 scoped_ptr<media::TextTrack> MediaSourceDelegate::OnAddTextTrack(

407 media::TextKind kind,	407 media::TextKind kind,

408 const std::string& label,	408 const std::string& label,

409 const std::string& language) {	409 const std::string& language) {

410 return scoped_ptr<media::TextTrack>();	410 return scoped_ptr<media::TextTrack>();

411 }	411 }

412	412

413 } // namespace webkit_media	413 } // namespace webkit_media

OLD	NEW