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

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

Issue 2532323003: Public Sessions - prompt the user for audioCapture/videoCapture requests (Closed)
Patch Set: Addressed comments #1 Created 4 years 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_media_access_handler.cc
diff --git a/chrome/browser/media/public_session_media_access_handler.cc b/chrome/browser/media/public_session_media_access_handler.cc
new file mode 100644
index 0000000000000000000000000000000000000000..9fbc5bb1bc0c1c09b50a9e7244039cda6f9f7881
--- /dev/null
+++ b/chrome/browser/media/public_session_media_access_handler.cc
@@ -0,0 +1,179 @@
+// 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_media_access_handler.h"
+
+#include <utility>
+
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "base/memory/ptr_util.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"
+
+namespace {
+
+// Returns true if we're in a Public Session.
+bool IsPublicSession() {
+ return chromeos::LoginState::IsInitialized() &&
+ chromeos::LoginState::Get()->IsPublicSessionUser();
+}
+
+} // namespace
+
+PublicSessionMediaAccessHandler::PublicSessionMediaAccessHandler() {}
+
+PublicSessionMediaAccessHandler::~PublicSessionMediaAccessHandler() {}
+
+bool PublicSessionMediaAccessHandler::SupportsStreamType(
+ const content::MediaStreamType type,
+ const extensions::Extension* extension) {
+ return extension_media_access_handler_.SupportsStreamType(type, extension);
+}
+
+bool PublicSessionMediaAccessHandler::CheckMediaAccessPermission(
+ content::WebContents* web_contents,
+ const GURL& security_origin,
+ content::MediaStreamType type,
+ const extensions::Extension* extension) {
+ return extension_media_access_handler_.CheckMediaAccessPermission(
+ web_contents, security_origin, type, extension);
+}
+
+void PublicSessionMediaAccessHandler::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 (!IsPublicSession() || !extension->is_platform_app()) {
+ return extension_media_access_handler_.HandleRequest(web_contents, request,
+ callback, extension);
+ }
+
+ bool needs_prompt = false;
+ extensions::APIPermissionSet new_apis;
+ const UserChoice& user_choice = user_choice_cache_[extension->id()];
+
+ if (user_choice.NeedsPrompting(request.audio_type)) {
+ new_apis.insert(extensions::APIPermission::kAudioCapture);
+ needs_prompt = true;
+ }
+ if (user_choice.NeedsPrompting(request.video_type)) {
+ new_apis.insert(extensions::APIPermission::kVideoCapture);
+ needs_prompt = true;
+ }
+
+ if (!needs_prompt)
+ return ChainHandleRequest(web_contents, request, callback, extension);
Ivan Šandrk 2016/12/05 13:10:51 Returning a void - a bad idea or clever removal of
+
+ auto permission_set = base::MakeUnique<extensions::PermissionSet>(
+ new_apis, extensions::ManifestPermissionSet(),
+ extensions::URLPatternSet(), extensions::URLPatternSet());
+
+ auto prompt = base::MakeUnique<ExtensionInstallPrompt>(web_contents);
+ // Raw copy used *only* for calling ShowDialog (to avoid the awkward
+ // situation where the same unique_ptr is used as this and is passed through
+ // inside a callback).
+ auto prompt_raw = prompt.get();
+
+ // "Dialog closed" callback owns the prompt, hence the prompt gets destroyed
+ // together with the callback. The callback is guaranteed to be destroyed
+ // even if it's not run.
+ prompt_raw->ShowDialog(
+ base::Bind(&PublicSessionMediaAccessHandler::ResolvePermissionPrompt,
+ base::Unretained(this), web_contents, request, callback,
+ extension, std::move(prompt)),
+ extension,
+ nullptr, // Uses the extension icon.
+ base::MakeUnique<ExtensionInstallPrompt::Prompt>(
+ ExtensionInstallPrompt::PERMISSIONS_PROMPT),
+ std::move(permission_set),
+ ExtensionInstallPrompt::GetDefaultShowDialogCallback());
+}
+
+void PublicSessionMediaAccessHandler::ChainHandleRequest(
+ content::WebContents* web_contents,
+ const content::MediaStreamRequest& request,
+ const content::MediaResponseCallback& callback,
+ const extensions::Extension* extension) {
+ DCHECK(IsPublicSession() && extension && extension->is_platform_app());
+ const UserChoice& user_choice = user_choice_cache_[extension->id()];
+ content::MediaStreamRequest request_copy(request);
+
+ if (!user_choice.IsAllowed(content::MEDIA_DEVICE_AUDIO_CAPTURE))
+ request_copy.audio_type = content::MEDIA_NO_SERVICE;
+ if (!user_choice.IsAllowed(content::MEDIA_DEVICE_VIDEO_CAPTURE))
+ request_copy.video_type = content::MEDIA_NO_SERVICE;
+
+ // Pass the request through to the original class.
+ extension_media_access_handler_.HandleRequest(web_contents, request_copy,
+ callback, extension);
+}
+
+void PublicSessionMediaAccessHandler::ResolvePermissionPrompt(
+ content::WebContents* web_contents,
+ const content::MediaStreamRequest& request,
+ const content::MediaResponseCallback& callback,
+ const extensions::Extension* extension,
+ const std::unique_ptr<ExtensionInstallPrompt>& prompt,
+ ExtensionInstallPrompt::Result prompt_result) {
+ bool allowed = prompt_result == ExtensionInstallPrompt::Result::ACCEPTED;
+ UserChoice& user_choice = user_choice_cache_[extension->id()];
+
+ if (user_choice.NeedsPrompting(request.audio_type))
+ user_choice.Set(content::MEDIA_DEVICE_AUDIO_CAPTURE, allowed);
+ if (user_choice.NeedsPrompting(request.video_type))
+ user_choice.Set(content::MEDIA_DEVICE_VIDEO_CAPTURE, allowed);
+
+ ChainHandleRequest(web_contents, request, callback, extension);
+}
+
+bool PublicSessionMediaAccessHandler::UserChoice::IsAllowed(
+ content::MediaStreamType type) const {
+ switch (type) {
+ case content::MEDIA_DEVICE_AUDIO_CAPTURE:
+ return !audio_prompted_ || audio_allowed_;
+ case content::MEDIA_DEVICE_VIDEO_CAPTURE:
+ return !video_prompted_ || video_allowed_;
+ default:
+ NOTREACHED();
+ return false;
+ }
+}
+
+bool PublicSessionMediaAccessHandler::UserChoice::NeedsPrompting(
+ content::MediaStreamType type) const {
+ switch (type) {
+ case content::MEDIA_DEVICE_AUDIO_CAPTURE:
+ return !audio_prompted_;
+ case content::MEDIA_DEVICE_VIDEO_CAPTURE:
+ return !video_prompted_;
+ default:
+ return false;
+ }
+}
+
+void PublicSessionMediaAccessHandler::UserChoice::Set(
+ content::MediaStreamType type, bool allowed) {
+ switch (type) {
+ case content::MEDIA_DEVICE_AUDIO_CAPTURE:
+ DCHECK(!audio_prompted_);
+ audio_prompted_ = true;
+ audio_allowed_ = allowed;
+ break;
+ case content::MEDIA_DEVICE_VIDEO_CAPTURE:
+ DCHECK(!video_prompted_);
+ video_prompted_ = true;
+ video_allowed_ = allowed;
+ break;
+ default:
+ NOTREACHED();
+ }
+}

Powered by Google App Engine
This is Rietveld 408576698