webkit/media/android/webmediaplayer_in_process_android.cc - Issue 11961018: Update some #includes in webkit/media/android for headers that were moved from WebKit/chromium/publ…

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/media/android/webmediaplayer_in_process_android.cc

Issue 11961018: Update some #includes in webkit/media/android for headers that were moved from WebKit/chromium/publ… (Closed) Base URL: http://src.chromium.org/svn/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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « webkit/media/android/webmediaplayer_in_process_android.h ('k') | no next file » | 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 "webkit/media/android/webmediaplayer_in_process_android.h"	5 #include "webkit/media/android/webmediaplayer_in_process_android.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

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

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

10 #include "media/base/android/media_player_bridge.h"	10 #include "media/base/android/media_player_bridge.h"

11 #include "media/base/android/media_player_bridge_manager.h"	11 #include "media/base/android/media_player_bridge_manager.h"

	12 #include "third_party/WebKit/Source/Platform/chromium/public/WebCookieJar.h"

12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"	13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"

13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"	14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"

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

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

16 #include "webkit/media/android/stream_texture_factory_android.h"	16 #include "webkit/media/android/stream_texture_factory_android.h"

17 #include "webkit/media/android/webmediaplayer_manager_android.h"	17 #include "webkit/media/android/webmediaplayer_manager_android.h"

18	18

19 using WebKit::WebMediaPlayerClient;	19 using WebKit::WebMediaPlayerClient;

20 using WebKit::WebMediaPlayer;	20 using WebKit::WebMediaPlayer;

21 using WebKit::WebURL;	21 using WebKit::WebURL;

22 using media::MediaPlayerBridge;	22 using media::MediaPlayerBridge;

23	23

24 namespace webkit_media {	24 namespace webkit_media {

25	25

(...skipping 148 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
174 UpdateReadyState(WebMediaPlayer::ReadyStateHaveMetadata);	174 UpdateReadyState(WebMediaPlayer::ReadyStateHaveMetadata);

175 UpdateReadyState(WebMediaPlayer::ReadyStateHaveEnoughData);	175 UpdateReadyState(WebMediaPlayer::ReadyStateHaveEnoughData);

176 }	176 }

177	177

178 void WebMediaPlayerInProcessAndroid::OnTimeUpdate(	178 void WebMediaPlayerInProcessAndroid::OnTimeUpdate(

179 base::TimeDelta current_time) {}	179 base::TimeDelta current_time) {}

180	180

181 void WebMediaPlayerInProcessAndroid::Destroy() {}	181 void WebMediaPlayerInProcessAndroid::Destroy() {}

182	182

183 } // namespace webkit_media	183 } // namespace webkit_media

OLD	NEW