| Index: chrome/browser/media/public_session_media_access_handler.h
|
| diff --git a/chrome/browser/media/public_session_media_access_handler.h b/chrome/browser/media/public_session_media_access_handler.h
|
| index e809957b17a96891e3c9f03edd636bf93bbb957e..70e7aac8c24277cc8444eb986ea038afd28c3be5 100644
|
| --- a/chrome/browser/media/public_session_media_access_handler.h
|
| +++ b/chrome/browser/media/public_session_media_access_handler.h
|
| @@ -11,7 +11,6 @@
|
| #include "chrome/browser/media/media_access_handler.h"
|
| #include "content/public/common/media_stream_request.h"
|
| #include "extensions/common/extension_id.h"
|
| -#include "extensions/common/permissions/api_permission_set.h"
|
|
|
| // MediaAccessHandler for extension capturing requests in Public Sessions. This
|
| // class is implemented as a wrapper around ExtensionMediaAccessHandler. It
|
| @@ -46,13 +45,38 @@
|
| private:
|
| // Helper function used to chain the HandleRequest call into the original
|
| // inside of ExtensionMediaAccessHandler.
|
| - void ChainHandleRequest(
|
| - content::WebContents* web_contents,
|
| - const content::MediaStreamRequest& request,
|
| - const content::MediaResponseCallback& callback,
|
| - const extensions::Extension* extension,
|
| - const extensions::PermissionIDSet& allowed_permissions);
|
| + void ChainHandleRequest(content::WebContents* web_contents,
|
| + const content::MediaStreamRequest& request,
|
| + const content::MediaResponseCallback& callback,
|
| + const extensions::Extension* extension);
|
|
|
| + // Function used to resolve user decision regarding allowing audio/video.
|
| + void ResolvePermissionPrompt(content::WebContents* web_contents,
|
| + const content::MediaStreamRequest& request,
|
| + const content::MediaResponseCallback& callback,
|
| + const extensions::Extension* extension,
|
| + ExtensionInstallPrompt::Result prompt_result);
|
| +
|
| + // Class used to cache user choice regarding allowing audio/video capture.
|
| + class UserChoice {
|
| + public:
|
| + // Helper function for checking if audio/video is allowed by user choice.
|
| + bool IsAllowed(content::MediaStreamType type) const;
|
| + // Helper function which returns true if audio/video wasn't prompted yet.
|
| + bool NeedsPrompting(content::MediaStreamType type) const;
|
| + void Set(content::MediaStreamType type, bool allowed);
|
| + void SetPrompted(content::MediaStreamType type);
|
| +
|
| + private:
|
| + bool audio_prompted_ = false;
|
| + bool audio_allowed_ = false;
|
| + bool video_prompted_ = false;
|
| + bool video_allowed_ = false;
|
| + };
|
| +
|
| + std::map<extensions::ExtensionId, UserChoice> user_choice_cache_;
|
| + std::map<extensions::ExtensionId, std::unique_ptr<ExtensionInstallPrompt>>
|
| + extension_install_prompt_map_;
|
| ExtensionMediaAccessHandler extension_media_access_handler_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PublicSessionMediaAccessHandler);
|
|
|