mirror of
https://github.com/electron/electron.git
synced 2026-05-02 03:00:22 -04:00
* chore: bump chromium in DEPS to 101.0.4911.0 * chore: bump chromium in DEPS to 101.0.4913.0 * chore: bump chromium in DEPS to 101.0.4915.0 * chore: bump chromium in DEPS to 101.0.4917.0 * chore: bump chromium in DEPS to 101.0.4919.0 * chore: bump chromium in DEPS to 101.0.4921.0 * chore: bump chromium in DEPS to 101.0.4923.0 * chore: bump chromium in DEPS to 101.0.4925.0 * chore: bump chromium in DEPS to 101.0.4927.0 * chore: bump chromium in DEPS to 101.0.4929.0 * chore: update patches * chore: bump chromium in DEPS to 101.0.4931.0 * chore: update patches * 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3475388 Actual fixes in 1824792: Migrate DisplayClient to the new Mojo types | https://chromium-review.googlesource.com/c/chromium/src/+/1824792 * 3503874: Remove base::size(), base::empty(), and base::data(). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3503874 * chore: reconcile patches with main rebase * chore: bump chromium in DEPS to 101.0.4933.0 * chore: update patches * 3329593: [Fenced Frame] Ensure to support external protocols in a fenced frame Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3329593 * 3503874: Remove base::size(), base::empty(), and base::data(). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3503874 * 3446451: Use forward decl of ImageSkiaRep in //ui/gfx/image/image_skia.h Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3446451 * 3499818: partition_alloc: Rename AllocFlags to AllocWithFlags Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3499818 * chore: bump chromium in DEPS to 101.0.4935.0 * chore: update patches * 3463286: partition_alloc: Move PartitionAlloc into the own namespaces (15 of N) Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3463286 * 3506590: Reland "Support ChromeOS external protocol dialog for Fenced Frame navigations" Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3506590 * 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3475388 Actual fixes in 1880987: Convert URLLoaderReqeust from //content to new Mojo types | https://chromium-review.googlesource.com/c/chromium/src/+/1880987 The change in the roll started causing the legacy types to fail * chore: missing SkRegion include * 3499600: Introduce blink::WebCssOrigin Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3499600 * fixup!: 3503874: Remove base::size(), base::empty(), and base::data(). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3503874 * chore: bump chromium in DEPS to 101.0.4937.0 * chore: update patches * 3500826: [locales] Refactor locales for ios Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3500826 * 3509531: Make some public Blink media files private Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3509531 * 3497377: bluetooth: Add BluetoothDevice.forget() Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3497377 * chore: bump chromium in DEPS to 101.0.4939.0 * chore: bump chromium in DEPS to 101.0.4941.0 * 3514804: Deprecate all existing uses of mojo_base.mojom.{Dictionary,List}Value. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3514804 * 3502592: Delete PPAPI init/shutdown code in //pdf. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3502592 * chore: update patches * fixup! 3502592: Delete PPAPI init/shutdown code in //pdf. * chore: bump chromium in DEPS to 101.0.4943.0 * chore: fix lint, remove unneeded headers * fixup! 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> * update mojo calls in offscreen patch * update hunspell filenames * chore: bump chromium in DEPS to 101.0.4945.0 * chore: update patches * fix offscreen patch again * chore: bump chromium in DEPS to 101.0.4947.0 * chore: update patches * chore: bump chromium in DEPS to 101.0.4949.0 * support unseasoned pdf * update patches * chore: update patches * chore: [IWYU] include missing skia headers * chore: bump chromium in DEPS to 101.0.4951.0 * chore: update patches * 3457645: media: Remove IsKeySystemsUpdateNeeded() https://chromium-review.googlesource.com/c/chromium/src/+/3457645 * chore: bump chromium in DEPS to 102.0.4952.2 * chore: update patches * 3488672: Add documentId as a parameter in tabs.connect() and tabs.sendMessage(). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3488672 * 3508375: Fix an issue dangerous dialog is not shown for some apk download Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3508375 * chore: bump chromium in DEPS to 102.0.4953.0 * chore: update patches * 3510189: Harden up drag and drop support across same-process boundaries. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3510189 * 3526815: Remove hardcoded colors from chrome/browser/ui/views/overlay/. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3526815 * chore: bump chromium in DEPS to 102.0.4955.0 * build: add af and ur locale to manifests 3498914 [locales] Add af and ur to desktop Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3498914 * fixup! build: add af and ur locale to manifests * chore: bump chromium in DEPS to 102.0.4957.0 * 3529090: gin: set JS flags before v8 initialization Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3529090 chore: fix code shear in chromium/gin_enable_disable_v8_platform.patch * chore: update patches * 3536433: [network] Rename data_path and http_cache_path from _path to _directory. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3536433 * 3111565: Relocated Page.printToPDF implementation to //components Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3111565 refactor: inject E args to PrintRequestedPages() and ScriptedPrintCallback TODO: currently passes a placeholder for job_settings. We have other code paths that inject settings from electron_api_web_contents.cc. Should those be injected here as well? (CC @codebytere) * fixup! 3111565: Relocated Page.printToPDF implementation to //components * fixup! 3111565: Relocated Page.printToPDF implementation to //components * 3520025: Make "libcxx_abi_unstable" not a gn arg Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3520025 build: since it is no longer a gn arg, patch it in * chore: change usages of std::vector with const elements (#33373) * chore: bump chromium in DEPS to 102.0.4959.0 * chore: update patches * build: iwyu base/threading/platform_thread.h * 3525774: Add GPSForCurrentDocument() into PermissionControllerDelegate. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3525774 refactor: copy upstream impl of GetPermissionStatusForCurrentDocument into +ElectronPermissionManager * use gclient_gn_args_from instead of hand-copying * checkout mac on mac * chore: update patches * Revert "checkout mac on mac" This reverts commitfe9ccf49ec. * fixup! 3525774: Add GPSForCurrentDocument() into PermissionControllerDelegate. * fixup! 3457645: media: Remove IsKeySystemsUpdateNeeded() add nogncheck * fix: set .eslintrc.json to root to avoid cascade to chromium eslintrc * Xref:6dfdf79b8cXref: https://reviews.llvm.org/D101458 Upstream added a CMakeLists.txt in an include dir ¯\_(ツ)_/¯ and so it must be enumerated in filenames.libcxxabi.gni * 3511268: Remove unused headers from cxx17_backports.h https://chromium-review.googlesource.com/c/chromium/src/+/3511268 use std::size instead of base::size * iwyu: SkPaint 3488428: [includes] Fix transitive includes of SkImageEncoder * chore: [IWYU] include missing skia headers * fixup! 3511268: Remove unused headers from cxx17_backports.h * chore: bump chromium in DEPS to 102.0.4961.0 * chore: update patches * fixup! 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T> chore: remove unused #include * fixup! 3510189: Harden up drag and drop support across same-process boundaries. | https://chromium-review.googlesource.com/c/chromium/src/+/3510189 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
142 lines
5.7 KiB
C++
142 lines
5.7 KiB
C++
// Copyright (c) 2016 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef ELECTRON_SHELL_BROWSER_ELECTRON_PERMISSION_MANAGER_H_
|
|
#define ELECTRON_SHELL_BROWSER_ELECTRON_PERMISSION_MANAGER_H_
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "base/callback.h"
|
|
#include "base/containers/id_map.h"
|
|
#include "content/public/browser/permission_controller_delegate.h"
|
|
#include "gin/dictionary.h"
|
|
|
|
namespace base {
|
|
class DictionaryValue;
|
|
class Value;
|
|
} // namespace base
|
|
|
|
namespace content {
|
|
class WebContents;
|
|
}
|
|
|
|
namespace electron {
|
|
|
|
class ElectronPermissionManager : public content::PermissionControllerDelegate {
|
|
public:
|
|
ElectronPermissionManager();
|
|
~ElectronPermissionManager() override;
|
|
|
|
// disable copy
|
|
ElectronPermissionManager(const ElectronPermissionManager&) = delete;
|
|
ElectronPermissionManager& operator=(const ElectronPermissionManager&) =
|
|
delete;
|
|
|
|
using StatusCallback =
|
|
base::OnceCallback<void(blink::mojom::PermissionStatus)>;
|
|
using StatusesCallback = base::OnceCallback<void(
|
|
const std::vector<blink::mojom::PermissionStatus>&)>;
|
|
using RequestHandler = base::RepeatingCallback<void(content::WebContents*,
|
|
content::PermissionType,
|
|
StatusCallback,
|
|
const base::Value&)>;
|
|
using CheckHandler =
|
|
base::RepeatingCallback<bool(content::WebContents*,
|
|
content::PermissionType,
|
|
const GURL& requesting_origin,
|
|
const base::Value&)>;
|
|
|
|
using DeviceCheckHandler =
|
|
base::RepeatingCallback<bool(const v8::Local<v8::Object>&)>;
|
|
|
|
// Handler to dispatch permission requests in JS.
|
|
void SetPermissionRequestHandler(const RequestHandler& handler);
|
|
void SetPermissionCheckHandler(const CheckHandler& handler);
|
|
void SetDevicePermissionHandler(const DeviceCheckHandler& handler);
|
|
|
|
// content::PermissionControllerDelegate:
|
|
void RequestPermission(content::PermissionType permission,
|
|
content::RenderFrameHost* render_frame_host,
|
|
const GURL& requesting_origin,
|
|
bool user_gesture,
|
|
StatusCallback callback) override;
|
|
void RequestPermissionWithDetails(content::PermissionType permission,
|
|
content::RenderFrameHost* render_frame_host,
|
|
const GURL& requesting_origin,
|
|
bool user_gesture,
|
|
const base::DictionaryValue* details,
|
|
StatusCallback callback);
|
|
void RequestPermissions(
|
|
const std::vector<content::PermissionType>& permissions,
|
|
content::RenderFrameHost* render_frame_host,
|
|
const GURL& requesting_origin,
|
|
bool user_gesture,
|
|
StatusesCallback callback) override;
|
|
void RequestPermissionsWithDetails(
|
|
const std::vector<content::PermissionType>& permissions,
|
|
content::RenderFrameHost* render_frame_host,
|
|
const GURL& requesting_origin,
|
|
bool user_gesture,
|
|
const base::DictionaryValue* details,
|
|
StatusesCallback callback);
|
|
blink::mojom::PermissionStatus GetPermissionStatusForFrame(
|
|
content::PermissionType permission,
|
|
content::RenderFrameHost* render_frame_host,
|
|
const GURL& requesting_origin) override;
|
|
blink::mojom::PermissionStatus GetPermissionStatusForCurrentDocument(
|
|
content::PermissionType permission,
|
|
content::RenderFrameHost* render_frame_host) override;
|
|
|
|
bool CheckPermissionWithDetails(content::PermissionType permission,
|
|
content::RenderFrameHost* render_frame_host,
|
|
const GURL& requesting_origin,
|
|
const base::DictionaryValue* details) const;
|
|
|
|
bool CheckDevicePermission(content::PermissionType permission,
|
|
const url::Origin& origin,
|
|
const base::Value* object,
|
|
content::RenderFrameHost* render_frame_host) const;
|
|
|
|
void GrantDevicePermission(content::PermissionType permission,
|
|
const url::Origin& origin,
|
|
const base::Value* object,
|
|
content::RenderFrameHost* render_frame_host) const;
|
|
|
|
protected:
|
|
void OnPermissionResponse(int request_id,
|
|
int permission_id,
|
|
blink::mojom::PermissionStatus status);
|
|
|
|
// content::PermissionControllerDelegate:
|
|
void ResetPermission(content::PermissionType permission,
|
|
const GURL& requesting_origin,
|
|
const GURL& embedding_origin) override;
|
|
blink::mojom::PermissionStatus GetPermissionStatus(
|
|
content::PermissionType permission,
|
|
const GURL& requesting_origin,
|
|
const GURL& embedding_origin) override;
|
|
SubscriptionId SubscribePermissionStatusChange(
|
|
content::PermissionType permission,
|
|
content::RenderFrameHost* render_frame_host,
|
|
const GURL& requesting_origin,
|
|
base::RepeatingCallback<void(blink::mojom::PermissionStatus)> callback)
|
|
override;
|
|
void UnsubscribePermissionStatusChange(SubscriptionId id) override;
|
|
|
|
private:
|
|
class PendingRequest;
|
|
using PendingRequestsMap = base::IDMap<std::unique_ptr<PendingRequest>>;
|
|
|
|
RequestHandler request_handler_;
|
|
CheckHandler check_handler_;
|
|
DeviceCheckHandler device_permission_handler_;
|
|
|
|
PendingRequestsMap pending_requests_;
|
|
};
|
|
|
|
} // namespace electron
|
|
|
|
#endif // ELECTRON_SHELL_BROWSER_ELECTRON_PERMISSION_MANAGER_H_
|