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

Unified Diff: android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java

Issue 962793005: Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rename createSession to createSessionFromNative to avoid bug in FindBugs 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/java/src/org/chromium/android_webview/AwBrowserProcess.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
index c1529e66148c3ce9438731474592ffd31fc4a06d..592e48f801bd76f88127335cfcd1b1ce663c5bbb 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
@@ -5,7 +5,6 @@
package org.chromium.android_webview;
import android.content.Context;
-import android.util.Log;
import org.chromium.base.PathUtils;
import org.chromium.base.ThreadUtils;
@@ -13,9 +12,6 @@ import org.chromium.base.library_loader.LibraryLoader;
import org.chromium.base.library_loader.LibraryProcessType;
import org.chromium.base.library_loader.ProcessInitException;
import org.chromium.content.browser.BrowserStartupController;
-import org.chromium.media.MediaDrmBridge;
-
-import java.util.UUID;
/**
* Wrapper for the steps needed to initialize the java and native sides of webview chromium.
@@ -60,25 +56,10 @@ public abstract class AwBrowserProcess {
try {
BrowserStartupController.get(context, LibraryProcessType.PROCESS_WEBVIEW)
.startBrowserProcessesSync(true);
- initializePlatformKeySystem();
} catch (ProcessInitException e) {
throw new RuntimeException("Cannot initialize WebView", e);
}
}
});
}
-
- private static void initializePlatformKeySystem() {
- String[] mappings = AwResource.getConfigKeySystemUuidMapping();
- for (String mapping : mappings) {
- try {
- String fragments[] = mapping.split(",");
- String keySystem = fragments[0].trim();
- UUID uuid = UUID.fromString(fragments[1]);
- MediaDrmBridge.addKeySystemUuidMapping(keySystem, uuid);
- } catch (java.lang.RuntimeException e) {
- Log.e(TAG, "Can't parse key-system mapping: " + mapping);
- }
- }
- }
}
« no previous file with comments | « android_webview/common/aw_resource.h ('k') | android_webview/java/src/org/chromium/android_webview/AwResource.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698