diff options
| author | kkimlabs@chromium.org <kkimlabs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-23 04:15:45 +0000 |
|---|---|---|
| committer | kkimlabs@chromium.org <kkimlabs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-23 04:15:45 +0000 |
| commit | f961a0fedd9bfae93284d6d0d989f42da3caac7b (patch) | |
| tree | 770a1f9679799f8e50decff35ecc27cad4d89f8a /android_webview | |
| parent | d34e683c837a2e48a19c576b768ea516b2dfca1f (diff) | |
| download | chromium_src-f961a0fedd9bfae93284d6d0d989f42da3caac7b.zip chromium_src-f961a0fedd9bfae93284d6d0d989f42da3caac7b.tar.gz chromium_src-f961a0fedd9bfae93284d6d0d989f42da3caac7b.tar.bz2 | |
[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
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/native/aw_web_contents_delegate.cc | 7 | ||||
| -rw-r--r-- | android_webview/native/aw_web_contents_delegate.h | 4 |
2 files changed, 11 insertions, 0 deletions
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); |