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

Side by Side Diff: content/browser/media/session/media_session_delegate_android.cc

Issue 2237943002: Remove now-unnecessary .obj() in Java method calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch-context
Patch Set: Rebase *again* :( Created 4 years, 4 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/browser/media/session/media_session_delegate_android.h" 5 #include "content/browser/media/session/media_session_delegate_android.h"
6 6
7 #include "base/android/context_utils.h" 7 #include "base/android/context_utils.h"
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "jni/MediaSessionDelegate_jni.h" 9 #include "jni/MediaSessionDelegate_jni.h"
10 10
11 using base::android::JavaParamRef; 11 using base::android::JavaParamRef;
12 12
13 namespace content { 13 namespace content {
14 14
15 // static 15 // static
16 bool MediaSessionDelegateAndroid::Register(JNIEnv* env) { 16 bool MediaSessionDelegateAndroid::Register(JNIEnv* env) {
17 return RegisterNativesImpl(env); 17 return RegisterNativesImpl(env);
18 } 18 }
19 19
20 MediaSessionDelegateAndroid::MediaSessionDelegateAndroid( 20 MediaSessionDelegateAndroid::MediaSessionDelegateAndroid(
21 MediaSession* media_session) 21 MediaSession* media_session)
22 : media_session_(media_session) { 22 : media_session_(media_session) {
23 } 23 }
24 24
25 MediaSessionDelegateAndroid::~MediaSessionDelegateAndroid() { 25 MediaSessionDelegateAndroid::~MediaSessionDelegateAndroid() {
26 JNIEnv* env = base::android::AttachCurrentThread(); 26 JNIEnv* env = base::android::AttachCurrentThread();
27 DCHECK(env); 27 DCHECK(env);
28 Java_MediaSessionDelegate_tearDown(env, j_media_session_delegate_.obj()); 28 Java_MediaSessionDelegate_tearDown(env, j_media_session_delegate_);
29 } 29 }
30 30
31 void MediaSessionDelegateAndroid::Initialize() { 31 void MediaSessionDelegateAndroid::Initialize() {
32 JNIEnv* env = base::android::AttachCurrentThread(); 32 JNIEnv* env = base::android::AttachCurrentThread();
33 DCHECK(env); 33 DCHECK(env);
34 j_media_session_delegate_.Reset(Java_MediaSessionDelegate_create( 34 j_media_session_delegate_.Reset(Java_MediaSessionDelegate_create(
35 env, 35 env,
36 base::android::GetApplicationContext(), 36 base::android::GetApplicationContext(),
37 reinterpret_cast<intptr_t>(this))); 37 reinterpret_cast<intptr_t>(this)));
38 } 38 }
39 39
40 bool MediaSessionDelegateAndroid::RequestAudioFocus(MediaSession::Type type) { 40 bool MediaSessionDelegateAndroid::RequestAudioFocus(MediaSession::Type type) {
41 JNIEnv* env = base::android::AttachCurrentThread(); 41 JNIEnv* env = base::android::AttachCurrentThread();
42 DCHECK(env); 42 DCHECK(env);
43 return Java_MediaSessionDelegate_requestAudioFocus( 43 return Java_MediaSessionDelegate_requestAudioFocus(
44 env, j_media_session_delegate_.obj(), 44 env, j_media_session_delegate_, type == MediaSession::Type::Transient);
45 type == MediaSession::Type::Transient);
46 } 45 }
47 46
48 void MediaSessionDelegateAndroid::AbandonAudioFocus() { 47 void MediaSessionDelegateAndroid::AbandonAudioFocus() {
49 JNIEnv* env = base::android::AttachCurrentThread(); 48 JNIEnv* env = base::android::AttachCurrentThread();
50 DCHECK(env); 49 DCHECK(env);
51 Java_MediaSessionDelegate_abandonAudioFocus( 50 Java_MediaSessionDelegate_abandonAudioFocus(env, j_media_session_delegate_);
52 env, j_media_session_delegate_.obj());
53 } 51 }
54 52
55 void MediaSessionDelegateAndroid::OnSuspend( 53 void MediaSessionDelegateAndroid::OnSuspend(
56 JNIEnv*, const JavaParamRef<jobject>&, jboolean temporary) { 54 JNIEnv*, const JavaParamRef<jobject>&, jboolean temporary) {
57 // TODO(mlamouri): this check makes it so that if a MediaSession is paused and 55 // TODO(mlamouri): this check makes it so that if a MediaSession is paused and
58 // then loses audio focus, it will still stay in the Suspended state. 56 // then loses audio focus, it will still stay in the Suspended state.
59 // See https://crbug.com/539998 57 // See https://crbug.com/539998
60 if (!media_session_->IsActive()) 58 if (!media_session_->IsActive())
61 return; 59 return;
62 60
(...skipping 25 matching lines...) Expand all
88 // static 86 // static
89 std::unique_ptr<MediaSessionDelegate> MediaSessionDelegate::Create( 87 std::unique_ptr<MediaSessionDelegate> MediaSessionDelegate::Create(
90 MediaSession* media_session) { 88 MediaSession* media_session) {
91 MediaSessionDelegateAndroid* delegate = 89 MediaSessionDelegateAndroid* delegate =
92 new MediaSessionDelegateAndroid(media_session); 90 new MediaSessionDelegateAndroid(media_session);
93 delegate->Initialize(); 91 delegate->Initialize();
94 return std::unique_ptr<MediaSessionDelegate>(delegate); 92 return std::unique_ptr<MediaSessionDelegate>(delegate);
95 } 93 }
96 94
97 } // namespace content 95 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/android/media_throttler.cc ('k') | content/browser/mojo/interface_registrar_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698