OLD | NEW |
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 <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/android/context_utils.h" | 9 #include "base/android/context_utils.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
12 #include "base/thread_task_runner_handle.h" | 12 #include "base/threading/thread_task_runner_handle.h" |
13 #include "media/base/android/media_drm_bridge.h" | 13 #include "media/base/android/media_drm_bridge.h" |
14 #include "media/base/android/media_player_manager.h" | 14 #include "media/base/android/media_player_manager.h" |
15 | 15 |
16 namespace { | 16 namespace { |
17 | 17 |
18 const double kDefaultVolume = 1.0; | 18 const double kDefaultVolume = 1.0; |
19 | 19 |
20 } // namespace | 20 } // namespace |
21 | 21 |
22 namespace media { | 22 namespace media { |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 void MediaPlayerAndroid::DestroyListenerOnUIThread() { | 120 void MediaPlayerAndroid::DestroyListenerOnUIThread() { |
121 weak_factory_.InvalidateWeakPtrs(); | 121 weak_factory_.InvalidateWeakPtrs(); |
122 listener_.reset(); | 122 listener_.reset(); |
123 } | 123 } |
124 | 124 |
125 base::WeakPtr<MediaPlayerAndroid> MediaPlayerAndroid::WeakPtrForUIThread() { | 125 base::WeakPtr<MediaPlayerAndroid> MediaPlayerAndroid::WeakPtrForUIThread() { |
126 return weak_factory_.GetWeakPtr(); | 126 return weak_factory_.GetWeakPtr(); |
127 } | 127 } |
128 | 128 |
129 } // namespace media | 129 } // namespace media |
OLD | NEW |