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

Unified Diff: chrome/browser/media/public_session_tab_capture_access_handler.cc

Issue 2697833004: Revert of Public Sessions - prompt the user for pageCapture requests (Closed)
Patch Set: Created 3 years, 10 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/media/public_session_tab_capture_access_handler.cc
diff --git a/chrome/browser/media/public_session_tab_capture_access_handler.cc b/chrome/browser/media/public_session_tab_capture_access_handler.cc
deleted file mode 100644
index ff2a83675e30940af1da6be51cb1a39389fcaccd..0000000000000000000000000000000000000000
--- a/chrome/browser/media/public_session_tab_capture_access_handler.cc
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/media/public_session_tab_capture_access_handler.h"
-
-#include <utility>
-
-#include "base/bind.h"
-#include "base/bind_helpers.h"
-#include "base/memory/ptr_util.h"
-#include "chrome/browser/chromeos/extensions/public_session_permission_helper.h"
-#include "chrome/browser/profiles/profiles_state.h"
-#include "chromeos/login/login_state.h"
-#include "content/public/browser/web_contents.h"
-#include "extensions/common/extension.h"
-#include "extensions/common/permissions/manifest_permission_set.h"
-#include "extensions/common/permissions/permission_set.h"
-#include "extensions/common/url_pattern_set.h"
-
-PublicSessionTabCaptureAccessHandler::PublicSessionTabCaptureAccessHandler() {}
-
-PublicSessionTabCaptureAccessHandler::~PublicSessionTabCaptureAccessHandler() {}
-
-bool PublicSessionTabCaptureAccessHandler::SupportsStreamType(
- const content::MediaStreamType type,
- const extensions::Extension* extension) {
- return tab_capture_access_handler_.SupportsStreamType(type, extension);
-}
-
-bool PublicSessionTabCaptureAccessHandler::CheckMediaAccessPermission(
- content::WebContents* web_contents,
- const GURL& security_origin,
- content::MediaStreamType type,
- const extensions::Extension* extension) {
- return tab_capture_access_handler_.CheckMediaAccessPermission(
- web_contents, security_origin, type, extension);
-}
-
-void PublicSessionTabCaptureAccessHandler::HandleRequest(
- content::WebContents* web_contents,
- const content::MediaStreamRequest& request,
- const content::MediaResponseCallback& callback,
- const extensions::Extension* extension) {
- // This class handles requests for Public Sessions only, outside of them just
- // pass the request through to the original class.
- if (!profiles::IsPublicSession() || !extension ||
- (request.audio_type != content::MEDIA_TAB_AUDIO_CAPTURE &&
- request.video_type != content::MEDIA_TAB_VIDEO_CAPTURE)) {
- return tab_capture_access_handler_.HandleRequest(web_contents, request,
- callback, extension);
- }
-
- // This Unretained is safe because the lifetime of this object is until
- // process exit (living inside a base::Singleton object).
- auto prompt_resolved_callback = base::Bind(
- &PublicSessionTabCaptureAccessHandler::ChainHandleRequest,
- base::Unretained(this), web_contents, request, callback, extension);
-
- extensions::permission_helper::HandlePermissionRequest(
- *extension, {extensions::APIPermission::kTabCapture}, web_contents,
- prompt_resolved_callback, extensions::permission_helper::PromptFactory());
-}
-
-void PublicSessionTabCaptureAccessHandler::ChainHandleRequest(
- content::WebContents* web_contents,
- const content::MediaStreamRequest& request,
- const content::MediaResponseCallback& callback,
- const extensions::Extension* extension,
- const extensions::PermissionIDSet& allowed_permissions) {
- content::MediaStreamRequest request_copy(request);
-
- // If the user denied tab capture, here the request gets filtered out before
- // being passed on to the actual implementation.
- if (!allowed_permissions.ContainsID(extensions::APIPermission::kTabCapture)) {
- request_copy.audio_type = content::MEDIA_NO_SERVICE;
- request_copy.video_type = content::MEDIA_NO_SERVICE;
- }
-
- // Pass the request through to the original class.
- tab_capture_access_handler_.HandleRequest(web_contents, request_copy,
- callback, extension);
-}

Powered by Google App Engine
This is Rietveld 408576698