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

Unified Diff: android_webview/browser/aw_browser_main_parts.cc

Issue 962793005: Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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
Index: android_webview/browser/aw_browser_main_parts.cc
diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc
index be793ee8c0ba0fe2c311afd1b46e0e092eb00bac..753a5e49f329bcabed04a5cd0236afb7ba01d084 100644
--- a/android_webview/browser/aw_browser_main_parts.cc
+++ b/android_webview/browser/aw_browser_main_parts.cc
@@ -6,7 +6,9 @@
#include "android_webview/browser/aw_browser_context.h"
#include "android_webview/browser/aw_dev_tools_discovery_provider.h"
+#include "android_webview/browser/aw_media_client_android.h"
#include "android_webview/browser/aw_result_codes.h"
+#include "android_webview/common/aw_resource.h"
#include "android_webview/native/public/aw_assets.h"
#include "base/android/build_info.h"
#include "base/android/locale_utils.h"
@@ -19,6 +21,7 @@
#include "content/public/common/content_switches.h"
#include "content/public/common/result_codes.h"
#include "content/public/common/url_utils.h"
+#include "media/base/android/media_client_android.h"
#include "net/android/network_change_notifier_factory_android.h"
#include "net/base/network_change_notifier.h"
#include "ui/base/l10n/l10n_util.h"
@@ -100,6 +103,9 @@ void AwBrowserMainParts::PreMainMessageLoopRun() {
discovery_manager->AddProvider(make_scoped_ptr(
new AwDevToolsDiscoveryProvider()));
+ media::SetMediaClientAndroid(
+ new AwMediaClientAndroid(AwResource::GetConfigKeySystemUuidMapping()));
+
// This is needed for WebView Classic backwards compatibility
// See crbug.com/298495
content::SetMaxURLChars(20 * 1024 * 1024);

Powered by Google App Engine
This is Rietveld 408576698