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

Unified Diff: content/gpu/gpu_child_thread.cc

Issue 2756333002: Rename MediaClientAndroid to MediaDrmBridgeClient (Closed)
Patch Set: Fix .h guards Created 3 years, 9 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 | « content/browser/browser_main_loop.cc ('k') | content/public/common/content_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/gpu/gpu_child_thread.cc
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
index 6c8d424431666b8842517245f8fa99c07baa914c..ce7cc9690a6aa6da24ab2159eb16b43cc7dc400a 100644
--- a/content/gpu/gpu_child_thread.cc
+++ b/content/gpu/gpu_child_thread.cc
@@ -52,7 +52,7 @@
#endif
#if defined(OS_ANDROID)
-#include "media/base/android/media_client_android.h"
+#include "media/base/android/media_drm_bridge_client.h"
#endif
namespace content {
@@ -213,7 +213,8 @@ void GpuChildThread::Init(const base::Time& process_start_time) {
// When running in in-process mode, this has been set in the browser at
// ChromeBrowserMainPartsAndroid::PreMainMessageLoopRun().
if (!in_browser_process_)
- media::SetMediaClientAndroid(GetContentClient()->GetMediaClientAndroid());
+ media::SetMediaDrmBridgeClient(
+ GetContentClient()->GetMediaDrmBridgeClient());
#endif
// We don't want to process any incoming interface requests until
// OnInitialize() is invoked.
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/public/common/content_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698