From f961a0fedd9bfae93284d6d0d989f42da3caac7b Mon Sep 17 00:00:00 2001
From: "kkimlabs@chromium.org"
 <kkimlabs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 23 Sep 2013 04:15:45 +0000
Subject: [Android] EME permission on/off pref and infobar UI.

For protected media identifier access permission,
add global on/off preference setting and infobar permission gate UI.

BUG=281576

Review URL: https://chromiumcodereview.appspot.com/23531021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224650 0039d316-1c4b-4281-b951-d872f2087c98
---
 android_webview/native/aw_web_contents_delegate.cc | 7 +++++++
 android_webview/native/aw_web_contents_delegate.h  | 4 ++++
 2 files changed, 11 insertions(+)

(limited to 'android_webview')

diff --git a/android_webview/native/aw_web_contents_delegate.cc b/android_webview/native/aw_web_contents_delegate.cc
index 0acbbb4..d7435b0 100644
--- a/android_webview/native/aw_web_contents_delegate.cc
+++ b/android_webview/native/aw_web_contents_delegate.cc
@@ -176,6 +176,13 @@ void AwWebContentsDelegate::ActivateContents(WebContents* contents) {
   }
 }
 
+void AwWebContentsDelegate::RequestProtectedMediaIdentifierPermission(
+    const content::WebContents* web_contents,
+    const GURL& frame_url,
+    const base::Callback<void(bool)>& callback) {
+  NOTIMPLEMENTED();
+}
+
 static void FilesSelectedInChooser(
     JNIEnv* env, jclass clazz,
     jint process_id, jint render_id, jint mode_flags,
diff --git a/android_webview/native/aw_web_contents_delegate.h b/android_webview/native/aw_web_contents_delegate.h
index 8dc50ef..8f7a7bc 100644
--- a/android_webview/native/aw_web_contents_delegate.h
+++ b/android_webview/native/aw_web_contents_delegate.h
@@ -42,6 +42,10 @@ class AwWebContentsDelegate
                               bool* was_blocked) OVERRIDE;
   virtual void CloseContents(content::WebContents* source) OVERRIDE;
   virtual void ActivateContents(content::WebContents* contents) OVERRIDE;
+  virtual void RequestProtectedMediaIdentifierPermission(
+      const content::WebContents* web_contents,
+      const GURL& frame_url,
+      const base::Callback<void(bool)>& callback) OVERRIDE;
 };
 
 bool RegisterAwWebContentsDelegate(JNIEnv* env);
-- 
cgit v1.1