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

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

Issue 2416853005: Fixing naming issues in MediaSession (Closed)
Patch Set: addressed nits Created 4 years, 2 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_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" 8 #include "content/browser/media/session/media_session.h"
9 #include "content/browser/media/session/media_session_controller.h" 9 #include "content/browser/media/session/media_session_controller.h"
10 #include "content/browser/media/session/media_session_observer.h"
11 #include "media/base/media_switches.h" 10 #include "media/base/media_switches.h"
12 11
13 namespace content { 12 namespace content {
14 13
15 namespace { 14 namespace {
16 15
17 bool IsDefaultMediaSessionEnabled() { 16 bool IsDefaultMediaSessionEnabled() {
18 #if defined(OS_ANDROID) 17 #if defined(OS_ANDROID)
19 return true; 18 return true;
20 #else 19 #else
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 it->second->OnPlaybackPaused(); 87 it->second->OnPlaybackPaused();
89 } 88 }
90 89
91 void MediaSessionControllersManager::OnEnd(const MediaPlayerId& id) { 90 void MediaSessionControllersManager::OnEnd(const MediaPlayerId& id) {
92 if (!IsDefaultMediaSessionEnabled()) 91 if (!IsDefaultMediaSessionEnabled())
93 return; 92 return;
94 controllers_map_.erase(id); 93 controllers_map_.erase(id);
95 } 94 }
96 95
97 } // namespace content 96 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/session/media_session_controller.h ('k') | content/browser/media/session/media_session_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698