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

Side by Side Diff: chrome/browser/android/tab_web_contents_delegate_android.cc

Issue 2794283003: Remove MediaThrottler and MediaThrottleInfoBar (Closed)
Patch Set: Deleted Java code Created 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/tab_web_contents_delegate_android.h" 5 #include "chrome/browser/android/tab_web_contents_delegate_android.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "chrome/browser/android/banners/app_banner_manager_android.h" 13 #include "chrome/browser/android/banners/app_banner_manager_android.h"
14 #include "chrome/browser/android/feature_utilities.h" 14 #include "chrome/browser/android/feature_utilities.h"
15 #include "chrome/browser/android/hung_renderer_infobar_delegate.h" 15 #include "chrome/browser/android/hung_renderer_infobar_delegate.h"
16 #include "chrome/browser/android/media/media_throttle_infobar_delegate.h"
17 #include "chrome/browser/chrome_notification_types.h" 16 #include "chrome/browser/chrome_notification_types.h"
18 #include "chrome/browser/file_select_helper.h" 17 #include "chrome/browser/file_select_helper.h"
19 #include "chrome/browser/infobars/infobar_service.h" 18 #include "chrome/browser/infobars/infobar_service.h"
20 #include "chrome/browser/media/protected_media_identifier_permission_context.h" 19 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
21 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" 20 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
22 #include "chrome/browser/media/webrtc/media_stream_capture_indicator.h" 21 #include "chrome/browser/media/webrtc/media_stream_capture_indicator.h"
23 #include "chrome/browser/prerender/prerender_manager.h" 22 #include "chrome/browser/prerender/prerender_manager.h"
24 #include "chrome/browser/prerender/prerender_manager_factory.h" 23 #include "chrome/browser/prerender/prerender_manager_factory.h"
25 #include "chrome/browser/profiles/profile.h" 24 #include "chrome/browser/profiles/profile.h"
26 #include "chrome/browser/ui/android/bluetooth_chooser_android.h" 25 #include "chrome/browser/ui/android/bluetooth_chooser_android.h"
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 } 267 }
269 268
270 bool TabWebContentsDelegateAndroid::CheckMediaAccessPermission( 269 bool TabWebContentsDelegateAndroid::CheckMediaAccessPermission(
271 content::WebContents* web_contents, 270 content::WebContents* web_contents,
272 const GURL& security_origin, 271 const GURL& security_origin,
273 content::MediaStreamType type) { 272 content::MediaStreamType type) {
274 return MediaCaptureDevicesDispatcher::GetInstance() 273 return MediaCaptureDevicesDispatcher::GetInstance()
275 ->CheckMediaAccessPermission(web_contents, security_origin, type); 274 ->CheckMediaAccessPermission(web_contents, security_origin, type);
276 } 275 }
277 276
278 void TabWebContentsDelegateAndroid::RequestMediaDecodePermission(
279 content::WebContents* web_contents,
280 const base::Callback<void(bool)>& callback) {
281 MediaThrottleInfoBarDelegate::Create(web_contents, callback);
282 }
283
284 bool TabWebContentsDelegateAndroid::RequestPpapiBrokerPermission( 277 bool TabWebContentsDelegateAndroid::RequestPpapiBrokerPermission(
285 WebContents* web_contents, 278 WebContents* web_contents,
286 const GURL& url, 279 const GURL& url,
287 const base::FilePath& plugin_path, 280 const base::FilePath& plugin_path,
288 const base::Callback<void(bool)>& callback) { 281 const base::Callback<void(bool)>& callback) {
289 #if BUILDFLAG(ENABLE_PLUGINS) 282 #if BUILDFLAG(ENABLE_PLUGINS)
290 PepperBrokerInfoBarDelegate::Create( 283 PepperBrokerInfoBarDelegate::Create(
291 web_contents, url, plugin_path, callback); 284 web_contents, url, plugin_path, callback);
292 return true; 285 return true;
293 #else 286 #else
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 void NotifyStopped(JNIEnv* env, 470 void NotifyStopped(JNIEnv* env,
478 const JavaParamRef<jclass>& clazz, 471 const JavaParamRef<jclass>& clazz,
479 const JavaParamRef<jobject>& java_web_contents) { 472 const JavaParamRef<jobject>& java_web_contents) {
480 content::WebContents* web_contents = 473 content::WebContents* web_contents =
481 content::WebContents::FromJavaWebContents(java_web_contents); 474 content::WebContents::FromJavaWebContents(java_web_contents);
482 scoped_refptr<MediaStreamCaptureIndicator> indicator = 475 scoped_refptr<MediaStreamCaptureIndicator> indicator =
483 MediaCaptureDevicesDispatcher::GetInstance() 476 MediaCaptureDevicesDispatcher::GetInstance()
484 ->GetMediaStreamCaptureIndicator(); 477 ->GetMediaStreamCaptureIndicator();
485 indicator->NotifyStopped(web_contents); 478 indicator->NotifyStopped(web_contents);
486 } 479 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698