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

Unified Diff: chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastBrowserHelper.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
« no previous file with comments | « chromecast/browser/DEPS ('k') | chromecast/browser/cast_browser_main_parts.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastBrowserHelper.java
diff --git a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastBrowserHelper.java b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastBrowserHelper.java
index 937018d87624225e44d822c2e03b256f5bd4e77e..7b569732036b9474bee93dd7d6867d048b2d0d1d 100644
--- a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastBrowserHelper.java
+++ b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastBrowserHelper.java
@@ -19,11 +19,8 @@ import org.chromium.content.app.ContentApplication;
import org.chromium.content.browser.BrowserStartupController;
import org.chromium.content.browser.DeviceUtils;
import org.chromium.content.common.ContentSwitches;
-import org.chromium.media.MediaDrmBridge;
import org.chromium.net.NetworkChangeNotifier;
-import java.util.UUID;
-
/**
* Static, one-time initialization for the browser process.
*/
@@ -32,10 +29,6 @@ public class CastBrowserHelper {
public static final String COMMAND_LINE_ARGS_KEY = "commandLineArgs";
- private static final String PLAYREADY_KEY_SYSTEM_NAME = "com.chromecast.playready";
- private static final UUID PLAYREADY_UUID =
- UUID.fromString("9A04F079-9840-4286-AB92-E65BE0885F95");
-
private static boolean sIsBrowserInitialized = false;
/**
@@ -80,7 +73,6 @@ public class CastBrowserHelper {
// Cast shell always expects to receive notifications to track network state.
NetworkChangeNotifier.registerToReceiveNotificationsAlways();
sIsBrowserInitialized = true;
- MediaDrmBridge.addKeySystemUuidMapping(PLAYREADY_KEY_SYSTEM_NAME, PLAYREADY_UUID);
return true;
} catch (ProcessInitException e) {
Log.e(TAG, "Unable to launch browser process.", e);
« no previous file with comments | « chromecast/browser/DEPS ('k') | chromecast/browser/cast_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698