mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 113.0.5660.0 (main) (#37612)

Browse source 
* chore: bump chromium in DEPS to 113.0.5657.0

* chore: bump chromium in DEPS to 113.0.5660.0

* chore: update patches

printing.patch
4347664
4347664
4338810
4339496

mas_disable_remote_layer.patch
4334544
4335299

* Add API to verify `TOP_LEVEL_STORAGE_ACCESS` permission status

4306712

* Move os_crypt into a sync/ subdirectory.

4336304

* chore: generate libc++ headers

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
electron-roller[bot] 2023-03-20 07:06:57 -04:00 • committed by GitHub
parent 9611b641c9
commit 5261e08d0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
64 changed files with 391 additions and 377 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/browser/api/electron_api_safe_storage.cc
View file

@ -7,7 +7,7 @@
#include <string>
#include <vector>
#include "components/os_crypt/os_crypt.h"
#include "components/os_crypt/sync/os_crypt.h"
#include "shell/browser/browser.h"
#include "shell/common/gin_converters/base_converter.h"
#include "shell/common/gin_converters/callback_converter.h"

2
shell/browser/browser_process_impl.cc
View file

@ -14,7 +14,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "components/os_crypt/os_crypt.h"
#include "components/os_crypt/sync/os_crypt.h"
#include "components/prefs/in_memory_pref_store.h"
#include "components/prefs/json_pref_store.h"
#include "components/prefs/overlay_user_pref_store.h"

6
shell/browser/electron_browser_main_parts.cc
View file

@ -23,8 +23,8 @@
#include "chrome/browser/ui/color/chrome_color_mixers.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "components/os_crypt/key_storage_config_linux.h"
#include "components/os_crypt/os_crypt.h"
#include "components/os_crypt/sync/key_storage_config_linux.h"
#include "components/os_crypt/sync/os_crypt.h"
#include "content/browser/browser_main_loop.h" // nogncheck
#include "content/public/browser/browser_child_process_host_delegate.h"
#include "content/public/browser/browser_child_process_host_iterator.h"
@ -98,7 +98,7 @@
#endif
#if BUILDFLAG(IS_MAC)
#include "components/os_crypt/keychain_password_mac.h"
#include "components/os_crypt/sync/keychain_password_mac.h"
#include "shell/browser/ui/cocoa/views_delegate_mac.h"
#else
#include "shell/browser/ui/views/electron_views_delegate.h"

13
shell/browser/electron_permission_manager.cc
View file

@ -386,4 +386,17 @@ ElectronPermissionManager::GetPermissionStatusForWorker(
return GetPermissionStatus(permission, worker_origin, worker_origin);
}
blink::mojom::PermissionStatus
ElectronPermissionManager::GetPermissionStatusForEmbeddedRequester(
blink::PermissionType permission,
content::RenderFrameHost* render_frame_host,
const url::Origin& overridden_origin) {
if (render_frame_host->IsNestedWithinFencedFrame()) {
return blink::mojom::PermissionStatus::DENIED;
}
return GetPermissionStatus(
permission, overridden_origin.GetURL(),
render_frame_host->GetLastCommittedOrigin().GetURL());
}
} // namespace electron

4
shell/browser/electron_permission_manager.h
View file

@ -139,6 +139,10 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
blink::PermissionType permission,
content::RenderProcessHost* render_process_host,
const GURL& worker_origin) override;
blink::mojom::PermissionStatus GetPermissionStatusForEmbeddedRequester(
blink::PermissionType permission,
content::RenderFrameHost* render_frame_host,
const url::Origin& requesting_origin) override;
SubscriptionId SubscribePermissionStatusChange(
blink::PermissionType permission,
content::RenderProcessHost* render_process_host,

4
shell/browser/net/system_network_context_manager.cc
View file

@ -17,7 +17,7 @@
#include "chrome/common/chrome_features.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "components/os_crypt/os_crypt.h"
#include "components/os_crypt/sync/os_crypt.h"
#include "components/prefs/pref_service.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/network_service_instance.h"
@ -43,7 +43,7 @@
#include "url/gurl.h"
#if BUILDFLAG(IS_LINUX)
#include "components/os_crypt/key_storage_config_linux.h"
#include "components/os_crypt/sync/key_storage_config_linux.h"
#endif
namespace {