| Index: chrome/browser/media/webrtc/public_session_tab_capture_access_handler.h
|
| diff --git a/chrome/browser/media/webrtc/public_session_tab_capture_access_handler.h b/chrome/browser/media/webrtc/public_session_tab_capture_access_handler.h
|
| index a22dfad25665da6a2920c3a940df10d09679d10f..0b12e8dda51fe6dcf72a6e0141dbbb3b451d6795 100644
|
| --- a/chrome/browser/media/webrtc/public_session_tab_capture_access_handler.h
|
| +++ b/chrome/browser/media/webrtc/public_session_tab_capture_access_handler.h
|
| @@ -11,6 +11,7 @@
|
| #include "chrome/browser/media/webrtc/tab_capture_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 TabCapture API in Public Sessions. This class is
|
| // implemented as a wrapper around TabCaptureAccessHandler. It allows for finer
|
| @@ -23,9 +24,6 @@
|
| // when an extension uses the TabCapture API for the first time, we show the
|
| // user a dialog where they can choose whether to allow the extension access to
|
| // the API.
|
| -//
|
| -// TODO(isandrk): Refactor common code out of this class and
|
| -// PublicSessionMediaAccessHandler (crbug.com/672620).
|
| class PublicSessionTabCaptureAccessHandler : public CaptureAccessHandlerBase {
|
| public:
|
| PublicSessionTabCaptureAccessHandler();
|
| @@ -50,33 +48,9 @@ class PublicSessionTabCaptureAccessHandler : public CaptureAccessHandlerBase {
|
| 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 tab capture.
|
| - 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 tab capture.
|
| - class UserChoice {
|
| - public:
|
| - // Helper function for checking if tab capture is allowed by user choice.
|
| - bool IsAllowed() const;
|
| - // Helper function which returns true if user choice wasn't prompted yet.
|
| - bool NeedsPrompting() const;
|
| - void Set(bool allowed);
|
| - void SetPrompted();
|
| -
|
| - private:
|
| - bool tab_capture_prompted_ = false;
|
| - bool tab_capture_allowed_ = false;
|
| - };
|
| + const extensions::Extension* extension,
|
| + extensions::PermissionIDSet allowed_permissions);
|
|
|
| - std::map<extensions::ExtensionId, UserChoice> user_choice_cache_;
|
| - std::map<extensions::ExtensionId, std::unique_ptr<ExtensionInstallPrompt>>
|
| - extension_install_prompt_map_;
|
| TabCaptureAccessHandler tab_capture_access_handler_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PublicSessionTabCaptureAccessHandler);
|
|
|