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

Unified Diff: extensions/browser/guest_view/web_view/web_view_permission_helper.cc

Issue 459953002: Migrate geolocation permissions to the new common permission class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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: extensions/browser/guest_view/web_view/web_view_permission_helper.cc
diff --git a/extensions/browser/guest_view/web_view/web_view_permission_helper.cc b/extensions/browser/guest_view/web_view/web_view_permission_helper.cc
index c99eddea501c7783d193dcc4b24678d1f3527f19..079282b95d983268e3f63ebff46cc277decb0bd6 100644
--- a/extensions/browser/guest_view/web_view/web_view_permission_helper.cc
+++ b/extensions/browser/guest_view/web_view/web_view_permission_helper.cc
@@ -180,49 +180,8 @@ void WebViewPermissionHelper::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());
- RequestPermission(
- WEB_VIEW_PERMISSION_TYPE_MEDIA,
- request_info,
- base::Bind(&WebViewPermissionHelper::OnMediaPermissionResponse,
- weak_factory_.GetWeakPtr(),
- request,
- callback),
- false /* allowed_by_default */);
-}
-
-bool WebViewPermissionHelper::CheckMediaAccessPermission(
- content::WebContents* source,
- const GURL& security_origin,
- content::MediaStreamType type) {
- return web_view_guest()
- ->embedder_web_contents()
- ->GetDelegate()
- ->CheckMediaAccessPermission(
- web_view_guest()->embedder_web_contents(), security_origin, type);
-}
-
-void WebViewPermissionHelper::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);
+ web_view_permission_helper_delegate_-> RequestMediaAccessPermission(
Bernhard Bauer 2014/09/19 09:04:24 No space after "->"
Miguel Garcia 2014/09/24 11:04:44 I reverted this file since it did not belong to th
+ source, request, callback);
}
void WebViewPermissionHelper::CanDownload(

Powered by Google App Engine
This is Rietveld 408576698