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

Side by Side Diff: content/browser/android/media_player_manager_impl.cc

Issue 17101027: Add a function to convert key system into UUID (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nits Created 7 years, 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/android/media_player_manager_impl.h" 5 #include "content/browser/android/media_player_manager_impl.h"
6 6
7 #include "content/browser/android/content_view_core_impl.h" 7 #include "content/browser/android/content_view_core_impl.h"
8 #include "content/browser/android/media_resource_getter_impl.h" 8 #include "content/browser/android/media_resource_getter_impl.h"
9 #include "content/browser/web_contents/web_contents_view_android.h" 9 #include "content/browser/web_contents/web_contents_view_android.h"
10 #include "content/common/media/media_player_messages_android.h" 10 #include "content/common/media/media_player_messages_android.h"
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 void MediaPlayerManagerImpl::RemovePlayer(int player_id) { 479 void MediaPlayerManagerImpl::RemovePlayer(int player_id) {
480 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin(); 480 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin();
481 it != players_.end(); ++it) { 481 it != players_.end(); ++it) {
482 if ((*it)->player_id() == player_id) { 482 if ((*it)->player_id() == player_id) {
483 players_.erase(it); 483 players_.erase(it);
484 break; 484 break;
485 } 485 }
486 } 486 }
487 } 487 }
488 488
489 void MediaPlayerManagerImpl::AddDrmBridge(int media_keys_id,
490 const std::vector<uint8>& uuid) {
491 DCHECK(!GetDrmBridge(media_keys_id));
492 drm_bridges_.push_back(MediaDrmBridge::Create(media_keys_id, uuid));
493 }
494
489 void MediaPlayerManagerImpl::RemoveDrmBridge(int media_keys_id) { 495 void MediaPlayerManagerImpl::RemoveDrmBridge(int media_keys_id) {
490 for (ScopedVector<MediaDrmBridge>::iterator it = drm_bridges_.begin(); 496 for (ScopedVector<MediaDrmBridge>::iterator it = drm_bridges_.begin();
491 it != drm_bridges_.end(); ++it) { 497 it != drm_bridges_.end(); ++it) {
492 if ((*it)->media_keys_id() == media_keys_id) { 498 if ((*it)->media_keys_id() == media_keys_id) {
493 drm_bridges_.erase(it); 499 drm_bridges_.erase(it);
494 break; 500 break;
495 } 501 }
496 } 502 }
497 } 503 }
498 504
499 } // namespace content 505 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/media_player_manager_impl.h ('k') | media/base/android/media_drm_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698