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

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

Issue 975943003: Revert of Revert of Propagate audible state from player to the containing tab" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "media/base/android/media_player_android.h" 5 #include "media/base/android/media_player_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop/message_loop_proxy.h" 9 #include "base/message_loop/message_loop_proxy.h"
10 #include "media/base/android/media_drm_bridge.h" 10 #include "media/base/android/media_drm_bridge.h"
11 #include "media/base/android/media_player_manager.h" 11 #include "media/base/android/media_player_manager.h"
12 12
13 namespace media { 13 namespace media {
14 14
15 MediaPlayerAndroid::MediaPlayerAndroid( 15 MediaPlayerAndroid::MediaPlayerAndroid(
16 int player_id, 16 int player_id,
17 MediaPlayerManager* manager, 17 MediaPlayerManager* manager,
18 const RequestMediaResourcesCB& request_media_resources_cb, 18 const RequestMediaResourcesCB& request_media_resources_cb,
19 const GURL& frame_url) 19 const GURL& frame_url)
20 : request_media_resources_cb_(request_media_resources_cb), 20 : request_media_resources_cb_(request_media_resources_cb),
21 player_id_(player_id), 21 player_id_(player_id),
22 manager_(manager), 22 manager_(manager),
23 frame_url_(frame_url), 23 frame_url_(frame_url),
24 is_audible_(false),
24 weak_factory_(this) { 25 weak_factory_(this) {
25 listener_.reset(new MediaPlayerListener(base::MessageLoopProxy::current(), 26 listener_.reset(new MediaPlayerListener(base::MessageLoopProxy::current(),
26 weak_factory_.GetWeakPtr())); 27 weak_factory_.GetWeakPtr()));
27 } 28 }
28 29
29 MediaPlayerAndroid::~MediaPlayerAndroid() {} 30 MediaPlayerAndroid::~MediaPlayerAndroid() {}
30 31
31 GURL MediaPlayerAndroid::GetUrl() { 32 GURL MediaPlayerAndroid::GetUrl() {
32 return GURL(); 33 return GURL();
33 } 34 }
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 jobject j_context = base::android::GetApplicationContext(); 73 jobject j_context = base::android::GetApplicationContext();
73 DCHECK(j_context); 74 DCHECK(j_context);
74 75
75 listener_->CreateMediaPlayerListener(j_context, j_media_player); 76 listener_->CreateMediaPlayerListener(j_context, j_media_player);
76 } 77 }
77 78
78 void MediaPlayerAndroid::DetachListener() { 79 void MediaPlayerAndroid::DetachListener() {
79 listener_->ReleaseMediaPlayerListenerResources(); 80 listener_->ReleaseMediaPlayerListenerResources();
80 } 81 }
81 82
83 void MediaPlayerAndroid::SetAudible(bool is_audible) {
84 if (is_audible_ != is_audible) {
85 is_audible_ = is_audible;
86 manager_->OnAudibleStateChanged(player_id(), is_audible_);
87 }
88 }
82 89
83 } // namespace media 90 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698