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

Side by Side Diff: media/base/android/media_player_listener.cc

Issue 16907002: Update Android to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased 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
OLDNEW
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 "media/base/android/media_player_listener.h" 5 #include "media/base/android/media_player_listener.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop/message_loop_proxy.h" 10 #include "base/message_loop/message_loop_proxy.h"
11 #include "media/base/android/media_player_bridge.h" 11 #include "media/base/android/media_player_bridge.h"
12 12
13 // Auto generated jni class from MediaPlayerListener.java. 13 // Auto generated jni class from MediaPlayerListener.java.
14 // Check base/android/jni_generator/golden_sample_for_tests_jni.h for example. 14 // Check base/android/jni_generator/golden_sample_for_tests_jni.h for example.
15 #include "jni/MediaPlayerListener_jni.h" 15 #include "jni/MediaPlayerListener_jni.h"
16 16
17 using base::android::AttachCurrentThread; 17 using base::android::AttachCurrentThread;
18 using base::android::CheckException; 18 using base::android::CheckException;
19 using base::android::ScopedJavaLocalRef; 19 using base::android::ScopedJavaLocalRef;
20 20
21 namespace media { 21 namespace media {
22 22
23 MediaPlayerListener::MediaPlayerListener( 23 MediaPlayerListener::MediaPlayerListener(
24 const scoped_refptr<base::MessageLoopProxy>& message_loop, 24 const scoped_refptr<base::MessageLoopProxy>& message_loop,
25 base::WeakPtr<MediaPlayerBridge> media_player) 25 base::WeakPtr<MediaPlayerBridge> media_player)
26 : message_loop_(message_loop), 26 : message_loop_(message_loop),
27 media_player_(media_player) { 27 media_player_(media_player) {
28 DCHECK(message_loop_); 28 DCHECK(message_loop_.get());
29 DCHECK(media_player_); 29 DCHECK(media_player_);
30 } 30 }
31 31
32 MediaPlayerListener::~MediaPlayerListener() {} 32 MediaPlayerListener::~MediaPlayerListener() {}
33 33
34 void MediaPlayerListener::CreateMediaPlayerListener( 34 void MediaPlayerListener::CreateMediaPlayerListener(
35 jobject context, jobject media_player) { 35 jobject context, jobject media_player) {
36 JNIEnv* env = AttachCurrentThread(); 36 JNIEnv* env = AttachCurrentThread();
37 CHECK(env); 37 CHECK(env);
38 j_media_player_listener_.Reset( 38 j_media_player_listener_.Reset(
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 &MediaPlayerBridge::OnMediaInterrupted, media_player_)); 94 &MediaPlayerBridge::OnMediaInterrupted, media_player_));
95 } 95 }
96 96
97 bool MediaPlayerListener::RegisterMediaPlayerListener(JNIEnv* env) { 97 bool MediaPlayerListener::RegisterMediaPlayerListener(JNIEnv* env) {
98 bool ret = RegisterNativesImpl(env); 98 bool ret = RegisterNativesImpl(env);
99 DCHECK(g_MediaPlayerListener_clazz); 99 DCHECK(g_MediaPlayerListener_clazz);
100 return ret; 100 return ret;
101 } 101 }
102 102
103 } // namespace media 103 } // namespace media
OLDNEW
« no previous file with comments | « gpu/command_buffer/tests/gl_unittests_android.cc ('k') | net/quic/crypto/crypto_server_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698