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

Unified Diff: media/base/android/media_player_manager.cc

Issue 14314020: Rename MediaPlayerBridgeManager to MediaPlayerManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: additional rebase conflict Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/android/media_player_manager.h ('k') | media/media.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/media_player_manager.cc
diff --git a/media/base/decryptor.cc b/media/base/android/media_player_manager.cc
similarity index 68%
copy from media/base/decryptor.cc
copy to media/base/android/media_player_manager.cc
index e9b232ded713e80722667536177f6929066c1fe4..45e8fa4c928699bf5abf71b1c0c136847afc7de2 100644
--- a/media/base/decryptor.cc
+++ b/media/base/android/media_player_manager.cc
@@ -2,12 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "media/base/decryptor.h"
+#include "media/base/android/media_player_manager.h"
namespace media {
-Decryptor::Decryptor() {}
-
-Decryptor::~Decryptor() {}
+MediaPlayerManager::~MediaPlayerManager() {}
} // namespace media
« no previous file with comments | « media/base/android/media_player_manager.h ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698