OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/android/chrome_web_contents_delegate_android.h" | 5 #include "chrome/browser/android/chrome_web_contents_delegate_android.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "chrome/browser/android/feature_utilities.h" | 10 #include "chrome/browser/android/feature_utilities.h" |
| 11 #include "chrome/browser/android/media/media_throttle_infobar_delegate.h" |
11 #include "chrome/browser/chrome_notification_types.h" | 12 #include "chrome/browser/chrome_notification_types.h" |
12 #include "chrome/browser/file_select_helper.h" | 13 #include "chrome/browser/file_select_helper.h" |
13 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 14 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
14 #include "chrome/browser/media/media_stream_capture_indicator.h" | 15 #include "chrome/browser/media/media_stream_capture_indicator.h" |
15 #include "chrome/browser/media/protected_media_identifier_permission_context.h" | 16 #include "chrome/browser/media/protected_media_identifier_permission_context.h" |
16 #include "chrome/browser/media/protected_media_identifier_permission_context_fac
tory.h" | 17 #include "chrome/browser/media/protected_media_identifier_permission_context_fac
tory.h" |
17 #include "chrome/browser/prerender/prerender_manager.h" | 18 #include "chrome/browser/prerender/prerender_manager.h" |
18 #include "chrome/browser/prerender/prerender_manager_factory.h" | 19 #include "chrome/browser/prerender/prerender_manager_factory.h" |
19 #include "chrome/browser/profiles/profile.h" | 20 #include "chrome/browser/profiles/profile.h" |
20 #include "chrome/browser/ui/android/bluetooth_chooser_android.h" | 21 #include "chrome/browser/ui/android/bluetooth_chooser_android.h" |
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
255 } | 256 } |
256 | 257 |
257 bool ChromeWebContentsDelegateAndroid::CheckMediaAccessPermission( | 258 bool ChromeWebContentsDelegateAndroid::CheckMediaAccessPermission( |
258 content::WebContents* web_contents, | 259 content::WebContents* web_contents, |
259 const GURL& security_origin, | 260 const GURL& security_origin, |
260 content::MediaStreamType type) { | 261 content::MediaStreamType type) { |
261 return MediaCaptureDevicesDispatcher::GetInstance() | 262 return MediaCaptureDevicesDispatcher::GetInstance() |
262 ->CheckMediaAccessPermission(web_contents, security_origin, type); | 263 ->CheckMediaAccessPermission(web_contents, security_origin, type); |
263 } | 264 } |
264 | 265 |
| 266 void ChromeWebContentsDelegateAndroid::RequestMediaDecodePermission( |
| 267 content::WebContents* web_contents, |
| 268 const base::Callback<void(bool)>& callback) { |
| 269 MediaThrottleInfoBarDelegate::Create(web_contents, callback); |
| 270 } |
| 271 |
265 bool ChromeWebContentsDelegateAndroid::RequestPpapiBrokerPermission( | 272 bool ChromeWebContentsDelegateAndroid::RequestPpapiBrokerPermission( |
266 WebContents* web_contents, | 273 WebContents* web_contents, |
267 const GURL& url, | 274 const GURL& url, |
268 const base::FilePath& plugin_path, | 275 const base::FilePath& plugin_path, |
269 const base::Callback<void(bool)>& callback) { | 276 const base::Callback<void(bool)>& callback) { |
270 #if defined(ENABLE_PLUGINS) | 277 #if defined(ENABLE_PLUGINS) |
271 PepperBrokerInfoBarDelegate::Create( | 278 PepperBrokerInfoBarDelegate::Create( |
272 web_contents, url, plugin_path, callback); | 279 web_contents, url, plugin_path, callback); |
273 return true; | 280 return true; |
274 #else | 281 #else |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
400 jboolean IsCapturingVideo(JNIEnv* env, | 407 jboolean IsCapturingVideo(JNIEnv* env, |
401 const JavaParamRef<jclass>& clazz, | 408 const JavaParamRef<jclass>& clazz, |
402 const JavaParamRef<jobject>& java_web_contents) { | 409 const JavaParamRef<jobject>& java_web_contents) { |
403 content::WebContents* web_contents = | 410 content::WebContents* web_contents = |
404 content::WebContents::FromJavaWebContents(java_web_contents); | 411 content::WebContents::FromJavaWebContents(java_web_contents); |
405 scoped_refptr<MediaStreamCaptureIndicator> indicator = | 412 scoped_refptr<MediaStreamCaptureIndicator> indicator = |
406 MediaCaptureDevicesDispatcher::GetInstance()-> | 413 MediaCaptureDevicesDispatcher::GetInstance()-> |
407 GetMediaStreamCaptureIndicator(); | 414 GetMediaStreamCaptureIndicator(); |
408 return indicator->IsCapturingVideo(web_contents); | 415 return indicator->IsCapturingVideo(web_contents); |
409 } | 416 } |
OLD | NEW |