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

Unified Diff: chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc

Issue 574793003: Moving webview media permission request to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebasing Created 6 years, 3 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
Index: chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc
diff --git a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc
index 3279b883352a0d4b662adb35c548fe158a5d6385..f33f9dbb7a4e405bd671a0ed150238156160c639 100644
--- a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc
+++ b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc
@@ -121,44 +121,6 @@ void ChromeWebViewPermissionHelperDelegate::OnPermissionResponse(
#endif // defined(ENABLE_PLUGINS)
-void ChromeWebViewPermissionHelperDelegate::RequestMediaAccessPermission(
- content::WebContents* source,
- const content::MediaStreamRequest& request,
- const content::MediaResponseCallback& callback) {
- base::DictionaryValue request_info;
- request_info.SetString(guestview::kUrl, request.security_origin.spec());
- web_view_permission_helper()->RequestPermission(
- WEB_VIEW_PERMISSION_TYPE_MEDIA,
- request_info,
- base::Bind(
- &ChromeWebViewPermissionHelperDelegate::OnMediaPermissionResponse,
- base::Unretained(this),
- request,
- callback),
- false /* allowed_by_default */);
-}
-
- void ChromeWebViewPermissionHelperDelegate::OnMediaPermissionResponse(
- const content::MediaStreamRequest& request,
- const content::MediaResponseCallback& callback,
- bool allow,
- const std::string& user_input) {
- if (!allow || !web_view_guest()->attached()) {
- // Deny the request.
- callback.Run(content::MediaStreamDevices(),
- content::MEDIA_DEVICE_INVALID_STATE,
- scoped_ptr<content::MediaStreamUI>());
- return;
- }
- if (!web_view_guest()->embedder_web_contents()->GetDelegate())
- return;
-
- web_view_guest()->embedder_web_contents()->GetDelegate()->
- RequestMediaAccessPermission(web_view_guest()->embedder_web_contents(),
- request,
- callback);
-}
-
void ChromeWebViewPermissionHelperDelegate::CanDownload(
content::RenderViewHost* render_view_host,
const GURL& url,

Powered by Google App Engine
This is Rietveld 408576698