Skip to content

armgit / cra

Public Imported from GitHub
0

The open-source Arc replacement for macOS. Spaces, pinned tabs, split view, Little Windows and Arc's shortcuts on Chromium, with your Arc sidebar imported in one go.

Web notifications: sites can ask, and a click opens the page like Arc (#129)

Victor Kildahl840087f5be65
diff --git a/Packages/CraCore/Sources/CraCore/PermissionPrompt.swift b/Packages/CraCore/Sources/CraCore/PermissionPrompt.swift
new file mode 100644
index 0000000..059adce
--- /dev/null
+++ b/Packages/CraCore/Sources/CraCore/PermissionPrompt.swift
@@ -0,0 +1,16 @@
+/// The question Cra's permission sheet asks for a page's request. `kinds` is CraCEF's bit set:
+/// 1 camera, 2 microphone, 4 location, 8 notifications, 16 anything else. Notifications ask
+/// like the others (Arc asks too; Messenger and the like need them), up to 0.1.27 they were
+/// denied without a sheet.
+public enum PermissionPrompt {
+ public static func message(origin: String, kinds: UInt) -> String {
+ var devices: [String] = []
+ if kinds & 1 != 0 { devices.append("camera") }
+ if kinds & 2 != 0 { devices.append("microphone") }
+ if kinds & 4 != 0 { devices.append("location") }
+ var wants = devices.isEmpty ? [] : ["use your \(devices.joined(separator: " and "))"]
+ if kinds & 8 != 0 { wants.append("show notifications") }
+ return wants.isEmpty ? "\(origin) is asking for a browser permission"
+ : "\(origin) wants to \(wants.joined(separator: " and "))"
+ }
+}
diff --git a/Packages/CraCore/Tests/CraCoreTests/PermissionPromptTests.swift b/Packages/CraCore/Tests/CraCoreTests/PermissionPromptTests.swift
new file mode 100644
index 0000000..1e923cc
--- /dev/null
+++ b/Packages/CraCore/Tests/CraCoreTests/PermissionPromptTests.swift
@@ -0,0 +1,25 @@
+import CraCore
+import Testing
+
+/// The permission sheet's question for each kind of request.
+struct PermissionPromptTests {
+ let site = "https://www.messenger.com/"
+
+ @Test func notificationsAskToShowNotifications() {
+ #expect(PermissionPrompt.message(origin: site, kinds: 8) == "https://www.messenger.com/ wants to show notifications")
+ }
+
+ @Test func devicesAreUsed() {
+ #expect(PermissionPrompt.message(origin: site, kinds: 1 | 2) == "https://www.messenger.com/ wants to use your camera and microphone")
+ #expect(PermissionPrompt.message(origin: site, kinds: 4) == "https://www.messenger.com/ wants to use your location")
+ }
+
+ @Test func devicesAndNotificationsTogether() {
+ #expect(PermissionPrompt.message(origin: site, kinds: 1 | 8) == "https://www.messenger.com/ wants to use your camera and show notifications")
+ }
+
+ @Test func anythingElseIsAGenericPermission() {
+ #expect(PermissionPrompt.message(origin: site, kinds: 16) == "https://www.messenger.com/ is asking for a browser permission")
+ #expect(PermissionPrompt.message(origin: site, kinds: 0) == "https://www.messenger.com/ is asking for a browser permission")
+ }
+}
diff --git a/Sources/Cra/Services/BrowserManager.swift b/Sources/Cra/Services/BrowserManager.swift
index a8bfa72..0c6e624 100644
--- a/Sources/Cra/Services/BrowserManager.swift
+++ b/Sources/Cra/Services/BrowserManager.swift
@@ -61,8 +61,9 @@ protocol BrowserManagerDelegate: AnyObject {
func browserManagerFocusedBrowser(_ tabID: UUID)
/// The page closed itself (window.close()).
func browserManagerPageClosedTab(_ tabID: UUID)
- /// An extension asked for this tab to be in front (chrome.tabs.update with active: true).
- func browserManagerActivationRequested(_ tabID: UUID)
+ /// An extension asked for this tab to be in front (chrome.tabs.update with active: true),
+ /// or with byPage the page did (window.focus(), clients.focus() from a notification click).
+ func browserManagerActivationRequested(_ tabID: UUID, byPage: Bool)
/// Arc's Peek: a link the user clicked (or Shift-clicked) in `tabID`, whose page is at
/// `pageURL`. Return true when it opens in a Peek instead.
func browserManagerOpensPeek(url: String, fromTab tabID: UUID, pageURL: String, shiftClick: Bool) -> Bool
@@ -967,16 +968,8 @@ final class BrowserManager: NSObject, @preconcurrency CraBrowserDelegate {
}
func browser(_ browser: CraBrowser, requestsPermissionForOrigin origin: String, kinds: UInt, completion: @escaping (Bool) -> Void) {
- // Notification prompts are denied quietly (no modal), like Arc's default.
- if kinds == 8 { completion(false); return }
- var what: [String] = []
- if kinds & 1 != 0 { what.append("camera") }
- if kinds & 2 != 0 { what.append("microphone") }
- if kinds & 4 != 0 { what.append("location") }
- if kinds & 8 != 0 { what.append("notifications") }
let alert = NSAlert()
- alert.messageText = what.isEmpty ? "\(origin) is asking for a browser permission"
- : "\(origin) wants to use your \(what.joined(separator: " and "))"
+ alert.messageText = PermissionPrompt.message(origin: origin, kinds: kinds)
alert.addButton(withTitle: "Allow")
alert.addButton(withTitle: "Block")
guard let window = container.window else { completion(false); return }
@@ -988,9 +981,9 @@ final class BrowserManager: NSObject, @preconcurrency CraBrowserDelegate {
delegate?.browserManagerFocusedBrowser(id)
}
- func browserRequestsActivation(_ browser: CraBrowser) {
+ func browserRequestsActivation(_ browser: CraBrowser, byPage: Bool) {
guard let id = tabID(of: browser) else { return }
- delegate?.browserManagerActivationRequested(id)
+ delegate?.browserManagerActivationRequested(id, byPage: byPage)
}
func browserDidClose(_ browser: CraBrowser) {
diff --git a/Sources/Cra/UI/Windows/MainWindowController.swift b/Sources/Cra/UI/Windows/MainWindowController.swift
index 8da20d7..f3c4660 100644
--- a/Sources/Cra/UI/Windows/MainWindowController.swift
+++ b/Sources/Cra/UI/Windows/MainWindowController.swift
@@ -1263,10 +1263,17 @@ final class MainWindowController: NSWindowController, NSWindowDelegate, BrowserM
func browserManagerPageClosedTab(_ tabID: UUID) { closeTab(tabID) }
/// An extension brought one of this window's tabs to the front (SwitchyOmega's Options with
- /// its settings tab already open): selected, as in Arc (GitHub #38).
- func browserManagerActivationRequested(_ tabID: UUID) {
+ /// its settings tab already open): selected, as in Arc (GitHub #38). A page that asked
+ /// (Chromium allows that after a click on its notification, or from its opener) also
+ /// brings the window and Cra to the front, like Arc: Messenger's chat opens on a click.
+ func browserManagerActivationRequested(_ tabID: UUID, byPage: Bool) {
store.selectTab(tabID, window: windowID)
- if NSApp.isActive, window?.isKeyWindow == false { showWindow(nil) }
+ if byPage, !HitchMonitor.background {
+ showWindow(nil)
+ NSApp.activate(ignoringOtherApps: true)
+ } else if NSApp.isActive, window?.isKeyWindow == false {
+ showWindow(nil)
+ }
}
/// Arc's Peek (Settings ▸ Tabs ▸ Links): a link to another site clicked in a favorite or
diff --git a/Sources/CraCEF/CraCEF.mm b/Sources/CraCEF/CraCEF.mm
index 7b87dbf..972a4b2 100644
--- a/Sources/CraCEF/CraCEF.mm
+++ b/Sources/CraCEF/CraCEF.mm
@@ -424,6 +424,38 @@ static void ApplyProfilePreferences(CefRefPtr<CefRequestContext> context) {
ApplyHttpsOnly(context);
}
+static const char kNotificationBlocksCleared[] = "cra.notification_blocks_cleared";
+
+/// Up to 0.1.27 Cra answered every notification request with a quiet deny, and Chromium kept
+/// each one as the site's notification block (Messenger, Facebook, YouTube...), so those sites
+/// could never ask again. Once per profile, those blocks go back to Ask. Blocks made after this
+/// come from the prompt and stay.
+static void ClearSilentNotificationBlocks(CefRefPtr<CefRequestContext> context) {
+ CefRefPtr<CefValue> done = context->GetPreference(kNotificationBlocksCleared);
+ if (!done || done->GetType() != VTYPE_BOOL || done->GetBool()) return;
+ CefRefPtr<CefValue> exceptions = context->GetPreference("profile.content_settings.exceptions.notifications");
+ if (exceptions && exceptions->GetType() == VTYPE_DICTIONARY) {
+ CefRefPtr<CefDictionaryValue> sites = exceptions->GetDictionary();
+ CefDictionaryValue::KeyList patterns;
+ sites->GetKeys(patterns);
+ for (const CefString& pattern : patterns) {
+ CefRefPtr<CefDictionaryValue> entry = sites->GetDictionary(pattern);
+ if (!entry || entry->GetInt("setting") != CEF_CONTENT_SETTING_VALUE_BLOCK) continue;
+ // "https://www.messenger.com:443,*": the requesting origin, any top-level site.
+ std::string origin = pattern.ToString().substr(0, pattern.ToString().find(','));
+ context->SetContentSetting(origin, origin, CEF_CONTENT_SETTING_TYPE_NOTIFICATIONS,
+ CEF_CONTENT_SETTING_VALUE_DEFAULT);
+ NSLog(@"CraCEF: notification block cleared for %s", origin.c_str());
+ }
+ }
+ CefRefPtr<CefValue> yes = CefValue::Create();
+ yes->SetBool(true);
+ CefString error;
+ if (!context->SetPreference(kNotificationBlocksCleared, yes, error)) {
+ NSLog(@"CraCEF: %s: %s", kNotificationBlocksCleared, error.ToString().c_str());
+ }
+}
+
// Cra's extension list (ExtensionStore) reads extensions.settings. On disk it lags ~10 s
// behind an install (Chromium's pref writer batches), so a "Load unpacked" extension was
// missing from the Site Control Center (GitHub #43); the live pref and its changes are not.
@@ -500,6 +532,7 @@ public:
void OnRequestContextInitialized(CefRefPtr<CefRequestContext> context) override {
ApplyProfilePreferences(context);
if (!path_) { g_incognitoReady = true; return; }
+ ClearSilentNotificationBlocks(context);
ObserveExtensionSettings(context);
if (!g_readyProfiles) g_readyProfiles = [NSMutableSet set];
[g_readyProfiles addObject:path_];
@@ -550,6 +583,13 @@ class CraApp : public CefApp, public CefBrowserProcessHandler {
public:
CefRefPtr<CefBrowserProcessHandler> GetBrowserProcessHandler() override { return this; }
+ void OnRegisterCustomPreferences(cef_preferences_type_t type, CefRawPtr<CefPreferenceRegistrar> registrar) override {
+ if (type != CEF_PREFERENCES_TYPE_REQUEST_CONTEXT) return;
+ CefRefPtr<CefValue> no = CefValue::Create();
+ no->SetBool(false);
+ registrar->AddPreference(kNotificationBlocksCleared, no);
+ }
+
CefRefPtr<CefClient> GetDefaultClient() override {
if (!g_strayClient) g_strayClient = new StrayBrowserClient();
return g_strayClient;
@@ -648,6 +688,7 @@ public:
void OnContextInitialized() override {
CEF_REQUIRE_UI_THREAD();
ApplyProfilePreferences(CefRequestContext::GetGlobalContext());
+ ClearSilentNotificationBlocks(CefRequestContext::GetGlobalContext());
ObserveExtensionSettings(CefRequestContext::GetGlobalContext());
ObserveSecureDNS();
g_contextInitialized = true;
@@ -1281,7 +1322,8 @@ public:
// Chromium's audible state, which CEF has no callback for: the engine sends it as a
// "Cra.audible" message (scripts/cef-patches/audible-state.patch). "Cra.activate": an
- // extension asked for this tab to be in front (scripts/cef-patches/extension-tab-activate.patch).
+ // extension asked for this tab to be in front (scripts/cef-patches/extension-tab-activate.patch),
+ // or with true the page did (scripts/cef-patches/page-activate.patch).
bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
CefProcessId source_process, CefRefPtr<CefProcessMessage> message) override {
if (source_process != PID_BROWSER) return false;
@@ -1291,8 +1333,10 @@ public:
return true;
}
if (message->GetName() == "Cra.activate") {
- if (o && [o.delegate respondsToSelector:@selector(browserRequestsActivation:)])
- [o.delegate browserRequestsActivation:o];
+ CefRefPtr<CefListValue> args = message->GetArgumentList();
+ BOOL byPage = args->GetSize() > 0 && args->GetBool(0);
+ if (o && [o.delegate respondsToSelector:@selector(browserRequestsActivation:byPage:)])
+ [o.delegate browserRequestsActivation:o byPage:byPage];
return true;
}
return false;
diff --git a/Sources/CraCEF/include/CraCEF.h b/Sources/CraCEF/include/CraCEF.h
index 15ddf1b..84f3b92 100644
--- a/Sources/CraCEF/include/CraCEF.h
+++ b/Sources/CraCEF/include/CraCEF.h
@@ -100,8 +100,9 @@ typedef NS_ENUM(NSInteger, CraDownloadState) {
/// is left out): `url` is the address that failed.
- (void)browser:(CraBrowser *)browser didFailLoadingURL:(NSString *)url errorCode:(NSInteger)errorCode;
/// An extension asked to bring this page's tab to the front (chrome.tabs.update with
-/// active: true; scripts/cef-patches/extension-tab-activate.patch).
-- (void)browserRequestsActivation:(CraBrowser *)browser;
+/// active: true; scripts/cef-patches/extension-tab-activate.patch), or with byPage the page
+/// did (window.focus(), or clients.focus() from a notification click; page-activate.patch).
+- (void)browserRequestsActivation:(CraBrowser *)browser byPage:(BOOL)byPage;
/// Arc's Peek: a link the user clicked (`shiftClick` NO: before it navigates the page or
/// opens as a target=_blank tab) or Shift-clicked (YES, instead of a new window). Return
/// YES to show it in a Peek; the page then stays where it is.
diff --git a/Tests/BrowserManagerLifecycleTests.swift b/Tests/BrowserManagerLifecycleTests.swift
index e7fa223..caf02bf 100644
--- a/Tests/BrowserManagerLifecycleTests.swift
+++ b/Tests/BrowserManagerLifecycleTests.swift
@@ -33,9 +33,12 @@ enum BrowserManagerLifecycleTests {
expect(manager.runtime(for: id) === replacement && manager.visibleTabID == id && manager.visibleTabIDs == [id],
"late close cannot remove or deselect the replacement")
expect(observer.closedTabs.isEmpty, "late page-close cannot archive the replacement tab")
- manager.browserRequestsActivation(old.browser)
- manager.browserRequestsActivation(replacement.browser)
+ manager.browserRequestsActivation(old.browser, byPage: false)
+ manager.browserRequestsActivation(replacement.browser, byPage: false)
expect(observer.activatedTabs == [id], "an extension's tabs.update activation reaches only the live page's tab")
+ manager.browserRequestsActivation(replacement.browser, byPage: true)
+ expect(observer.activatedTabs == [id, id] && observer.activatedByPage == [false, true],
+ "a page's own focus request (a notification click) arrives marked as the page's")
let retainedID = store.createTab(url: "https://example.test/retained").id
weak var retainedBrowser = manager.ensureRuntime(for: retainedID)?.browser
@@ -510,6 +513,7 @@ enum BrowserManagerLifecycleTests {
private final class Observer: BrowserManagerDelegate {
var closedTabs: [UUID] = []
var activatedTabs: [UUID] = []
+ var activatedByPage: [Bool] = []
var onPageWindowsChanged: (() -> Void)?
func browserManagerDidUpdate(_ tabID: UUID) {}
func browserManager(statusMessage: String) {}
@@ -524,6 +528,9 @@ private final class Observer: BrowserManagerDelegate {
func browserManagerHandleUnhandledKey(_ event: NSEvent) -> Bool { false }
func browserManagerFocusedBrowser(_ tabID: UUID) {}
func browserManagerPageClosedTab(_ tabID: UUID) { closedTabs.append(tabID) }
- func browserManagerActivationRequested(_ tabID: UUID) { activatedTabs.append(tabID) }
+ func browserManagerActivationRequested(_ tabID: UUID, byPage: Bool) {
+ activatedTabs.append(tabID)
+ activatedByPage.append(byPage)
+ }
func browserManagerOpensPeek(url: String, fromTab tabID: UUID, pageURL: String, shiftClick: Bool) -> Bool { false }
}
diff --git a/Tests/test-browser-manager.sh b/Tests/test-browser-manager.sh
index a3a9967..8bfb49b 100755
--- a/Tests/test-browser-manager.sh
+++ b/Tests/test-browser-manager.sh
@@ -11,7 +11,7 @@ xcrun swiftc -swift-version 5 -emit-module -emit-library -module-name CraCEF \
xcrun swiftc -swift-version 5 -parse-as-library ${CRA_TEST_SWIFTC_FLAGS:-} -I "$TEST_DIR" -L "$TEST_DIR" -lCraCEF \
-Xlinker -rpath -Xlinker "$TEST_DIR" \
"$MANAGER_SOURCE" Sources/Cra/Services/NowPlaying.swift Sources/Cra/Services/PageScript.swift Sources/Cra/Services/Scheduler.swift Sources/Cra/Services/DevToolsToggle.swift Sources/Cra/Services/CraLog.swift Sources/Cra/Services/PageProbe.swift Sources/Cra/Services/Persistence.swift \
- Sources/Cra/Perf/Perf.swift Packages/CraCore/Sources/CraCore/Perf/*.swift Packages/CraCore/Sources/CraCore/ExtensionPageRetry.swift Tests/Support/ManualScheduler.swift Tests/BrowserManagerSupport/AppServices.swift \
+ Sources/Cra/Perf/Perf.swift Packages/CraCore/Sources/CraCore/Perf/*.swift Packages/CraCore/Sources/CraCore/ExtensionPageRetry.swift Packages/CraCore/Sources/CraCore/PermissionPrompt.swift Tests/Support/ManualScheduler.swift Tests/BrowserManagerSupport/AppServices.swift \
Tests/BrowserManagerLifecycleTests.swift -o "$TEST_DIR/lifecycle-tests"
"$TEST_DIR/lifecycle-tests"
[ -z "${CRA_TEST_KEEP:-}" ] || cp "$TEST_DIR/lifecycle-tests" "$CRA_TEST_KEEP/"
diff --git a/scripts/build.sh b/scripts/build.sh
index ea7a4f3..27fe058 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -63,6 +63,14 @@ for entry in "|" " (Alerts)|.alerts" " (GPU)|.gpu" " (Plugin)|.plugin" " (Render
-e "s/__VERSION__/$VERSION/" -e "s/__BUILD__/$BUILD_NUMBER/" \
resources/Helper-Info.plist > "$HELPER/Contents/Info.plist"
echo -n "APPL????" > "$HELPER/Contents/PkgInfo"
+ # Chromium posts page notifications from the Alerts helper too, so macOS asks for it and lists
+ # it under System Settings ▸ Notifications: Cra's name and icon there, like Arc's helper.
+ if [ "$NAME_SUFFIX" = " (Alerts)" ]; then
+ mkdir -p "$HELPER/Contents/Resources"
+ cp resources/AppIcon.icns "$HELPER/Contents/Resources/AppIcon.icns"
+ /usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName Cra" -c "Add :CFBundleIconFile string AppIcon" \
+ -c "Add :NSUserNotificationAlertStyle string alert" "$HELPER/Contents/Info.plist"
+ fi
done
# The Dock tile plug-in (Info.plist NSDockTilePlugIn), a SwiftPM dynamic library in a bundle.
diff --git a/scripts/cef-patches/page-activate.patch b/scripts/cef-patches/page-activate.patch
new file mode 100644
index 0000000..d1c5601
--- /dev/null
+++ b/scripts/cef-patches/page-activate.patch
@@ -0,0 +1,83 @@
+diff --git a/cef/libcef/browser/chrome/browser_delegate.h b/cef/libcef/browser/chrome/browser_delegate.h
+--- a/cef/libcef/browser/chrome/browser_delegate.h
++++ b/cef/libcef/browser/chrome/browser_delegate.h
+@@ -172,6 +172,10 @@ class BrowserDelegate {
+ return std::nullopt;
+ }
+
++ // Cra: a page asked to come to the front (window.focus(), or a service
++ // worker's clients.focus() after a notification click).
++ virtual void PageActivationRequested() {}
++
+ // Returns true if draggable regions are supported.
+ virtual bool SupportsDraggableRegion() const { return false; }
+
+diff --git a/cef/libcef/browser/chrome/chrome_browser_delegate.cc b/cef/libcef/browser/chrome/chrome_browser_delegate.cc
+--- a/cef/libcef/browser/chrome/chrome_browser_delegate.cc
++++ b/cef/libcef/browser/chrome/chrome_browser_delegate.cc
+@@ -468,6 +468,24 @@ bool ChromeBrowserDelegate::HasViewsHostedOpener() const {
+ return opener_host_ && opener_host_->is_views_hosted();
+ }
+
++// Cra: "Cra.activate" with true: the client selects the tab and brings its
++// window and the app to the front, as Chrome does for its own tabs.
++void ChromeBrowserDelegate::PageActivationRequested() {
++ auto browser = ChromeBrowserHostImpl::GetBrowserForBrowser(browser_);
++ if (!browser) {
++ return;
++ }
++ auto client = browser->GetClient();
++ if (!client) {
++ return;
++ }
++ CefRefPtr<CefProcessMessage> message =
++ CefProcessMessage::Create("Cra.activate");
++ message->GetArgumentList()->SetBool(0, true);
++ client->OnProcessMessageReceived(browser.get(), browser->GetMainFrame(),
++ PID_BROWSER, message);
++}
++
+ void ChromeBrowserDelegate::OnPopupWebContentsCreated(
+ content::WebContents* source_contents,
+ const content::GlobalRenderFrameHostId& opener_id,
+diff --git a/cef/libcef/browser/chrome/chrome_browser_delegate.h b/cef/libcef/browser/chrome/chrome_browser_delegate.h
+--- a/cef/libcef/browser/chrome/chrome_browser_delegate.h
++++ b/cef/libcef/browser/chrome/chrome_browser_delegate.h
+@@ -78,6 +78,7 @@ class ChromeBrowserDelegate : public cef::BrowserDelegate {
+ bool IsToolbarButtonVisible(ToolbarButtonType button_type) override;
+ void UpdateFindBarBoundingBox(gfx::Rect* bounds) override;
+ void UpdateDialogTopInset(int* dialog_top_y) override;
++ void PageActivationRequested() override;
+ std::optional<bool> SupportsWindowFeature(int feature) const override;
+ bool SupportsDraggableRegion() const override;
+ void UpdateDraggableRegions(
+diff --git a/chrome/browser/ui/browser_web_contents_delegate/browser_web_contents_delegate.cc b/chrome/browser/ui/browser_web_contents_delegate/browser_web_contents_delegate.cc
+--- a/chrome/browser/ui/browser_web_contents_delegate/browser_web_contents_delegate.cc
++++ b/chrome/browser/ui/browser_web_contents_delegate/browser_web_contents_delegate.cc
+@@ -58,6 +58,11 @@
+ #include "chrome/browser/web_applications/web_app_registrar.h"
+ #include "chrome/browser/web_applications/web_app_tab_helper.h"
+ #include "chrome/browser/web_applications/web_app_utils.h"
++#include "cef/libcef/features/features.h"
++
++#if BUILDFLAG(ENABLE_CEF)
++#include "cef/libcef/browser/chrome/browser_delegate.h"
++#endif
+ #include "chrome/common/webui_url_constants.h"
+ #include "components/blocked_content/popup_blocker.h"
+ #include "components/blocked_content/popup_tracker.h"
+@@ -750,6 +755,14 @@ void BrowserWebContentsDelegate::ActivateContents(
+ return;
+ }
+ browser_->GetTabStripModel()->ActivateTabAt(index);
++#if BUILDFLAG(ENABLE_CEF)
++ // Cra: each page is a Views-hosted Browser with one tab, shown inside the
++ // client's own window, so the client brings the page forward itself.
++ if (browser_->cef_delegate() && browser_->cef_delegate()->IsViewsHosted()) {
++ browser_->cef_delegate()->PageActivationRequested();
++ return;
++ }
++#endif
+ window_->Activate();
+ }
+
diff --git a/scripts/fetch-cef.sh b/scripts/fetch-cef.sh
index 0529a7e..290ab04 100755
--- a/scripts/fetch-cef.sh
+++ b/scripts/fetch-cef.sh
@@ -13,7 +13,7 @@ CEF_VERSION="${CEF_VERSION:-156.0.15+gcf671c0+chromium-156.0.8078.80}"
ARCH="${CEF_ARCH:-macosarm64}"
NAME="cef_binary_${CEF_VERSION}_${ARCH}_minimal"
# Bump the suffix (codecs2, …) when the build changes but CEF_VERSION does not.
-CEF_RELEASE="${CEF_RELEASE:-cef-${CEF_VERSION%%+*}-codecs7}"
+CEF_RELEASE="${CEF_RELEASE:-cef-${CEF_VERSION%%+*}-codecs8}"
URL="${CEF_URL:-https://github.com/VictorKildahl/cra/releases/download/${CEF_RELEASE}/cef_binary_${ARCH}_minimal.tar.bz2}"
mkdir -p vendor