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

Unified Diff: webkit/support/platform_support_android.cc

Issue 10919075: Move android mediaplayer from render process to browser process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressing comments and resolving merge conflicts Created 8 years, 3 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 | « webkit/media/webkit_media.gypi ('k') | webkit/support/webkit_support.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/support/platform_support_android.cc
diff --git a/webkit/support/platform_support_android.cc b/webkit/support/platform_support_android.cc
index fdd0209a7b98661ca903dc3c6f617c67ccf6e270..40598ab1eeb7e964ef98f3d04bc579813f021a04 100644
--- a/webkit/support/platform_support_android.cc
+++ b/webkit/support/platform_support_android.cc
@@ -15,7 +15,7 @@
#include "googleurl/src/gurl.h"
#include "grit/webkit_resources.h"
#include "net/android/network_library.h"
-#include "media/base/android/media_player_bridge.h"
+#include "media/base/android/media_player_listener.h"
#include "ui/base/resource/resource_bundle.h"
#include "webkit/support/test_webkit_platform_support.h"
#include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
@@ -47,7 +47,7 @@ void BeforeInitialize(bool unit_test_mode) {
// which don't have Java capabilities. Init Java for only DumpRenderTree.
if (!unit_test_mode) {
JNIEnv* env = base::android::AttachCurrentThread();
- media::MediaPlayerBridge::RegisterMediaPlayerListener(env);
+ media::MediaPlayerListener::RegisterMediaPlayerListener(env);
net::android::RegisterNetworkLibrary(env);
}
}
« no previous file with comments | « webkit/media/webkit_media.gypi ('k') | webkit/support/webkit_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698