Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: content/renderer/media/android/webmediaplayer_android.h

Issue 19620002: Use a direct include of the message_loop header in content/, part 4. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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
OLDNEW
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 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "base/message_loop.h" 16 #include "base/message_loop/message_loop.h"
17 #include "base/time/time.h" 17 #include "base/time/time.h"
18 #include "cc/layers/video_frame_provider.h" 18 #include "cc/layers/video_frame_provider.h"
19 #include "content/renderer/media/android/media_info_loader.h" 19 #include "content/renderer/media/android/media_info_loader.h"
20 #include "content/renderer/media/android/media_source_delegate.h" 20 #include "content/renderer/media/android/media_source_delegate.h"
21 #include "content/renderer/media/android/stream_texture_factory_android.h" 21 #include "content/renderer/media/android/stream_texture_factory_android.h"
22 #include "content/renderer/media/crypto/proxy_decryptor.h" 22 #include "content/renderer/media/crypto/proxy_decryptor.h"
23 #include "gpu/command_buffer/common/mailbox.h" 23 #include "gpu/command_buffer/common/mailbox.h"
24 #include "media/base/android/media_player_android.h" 24 #include "media/base/android/media_player_android.h"
25 #include "media/base/demuxer_stream.h" 25 #include "media/base/demuxer_stream.h"
26 #include "media/base/media_keys.h" 26 #include "media/base/media_keys.h"
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 420
421 // The decryptor that manages decryption keys and decrypts encrypted frames. 421 // The decryptor that manages decryption keys and decrypts encrypted frames.
422 scoped_ptr<ProxyDecryptor> decryptor_; 422 scoped_ptr<ProxyDecryptor> decryptor_;
423 423
424 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 424 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
425 }; 425 };
426 426
427 } // namespace content 427 } // namespace content
428 428
429 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 429 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698