| OLD | NEW |
|---|
| 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_controllers_manager.h" | 5 #include "content/browser/media/session/media_session_controllers_manager.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "content/browser/media/session/media_session.h" | |
| 9 #include "content/browser/media/session/media_session_controller.h" | 8 #include "content/browser/media/session/media_session_controller.h" |
| 10 #include "media/base/media_switches.h" | 9 #include "media/base/media_switches.h" |
| 11 | 10 |
| 12 namespace content { | 11 namespace content { |
| 13 | 12 |
| 14 namespace { | 13 namespace { |
| 15 | 14 |
| 16 bool IsDefaultMediaSessionEnabled() { | 15 bool IsDefaultMediaSessionEnabled() { |
| 17 #if defined(OS_ANDROID) | 16 #if defined(OS_ANDROID) |
| 18 return true; | 17 return true; |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 it->second->OnPlaybackPaused(); | 86 it->second->OnPlaybackPaused(); |
| 88 } | 87 } |
| 89 | 88 |
| 90 void MediaSessionControllersManager::OnEnd(const MediaPlayerId& id) { | 89 void MediaSessionControllersManager::OnEnd(const MediaPlayerId& id) { |
| 91 if (!IsDefaultMediaSessionEnabled()) | 90 if (!IsDefaultMediaSessionEnabled()) |
| 92 return; | 91 return; |
| 93 controllers_map_.erase(id); | 92 controllers_map_.erase(id); |
| 94 } | 93 } |
| 95 | 94 |
| 96 } // namespace content | 95 } // namespace content |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2453623003:
Decouple MediaSession messages from WebContents (full patch) (Closed)
