From 989f9a4366e7486a215e9bde098a5c5f9caf95c9 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Mon, 10 Jul 2023 21:44:38 -0700
Subject: [PATCH] Continue adopting async/await.

---
 Mac/SafariExtension/SafariExtensionHandler.swift | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Mac/SafariExtension/SafariExtensionHandler.swift b/Mac/SafariExtension/SafariExtensionHandler.swift
index 2589d4034..8cf58ce06 100644
--- a/Mac/SafariExtension/SafariExtensionHandler.swift
+++ b/Mac/SafariExtension/SafariExtensionHandler.swift
@@ -72,10 +72,14 @@ class SafariExtensionHandler: SFSafariExtensionHandler {
     }
     
     override func toolbarItemClicked(in window: SFSafariWindow) {
-		window.getActiveTab { (activeTab) in
-			activeTab?.getActivePage(completionHandler: { (activePage) in
-				activePage?.dispatchMessageToScript(withName: "toolbarButtonClicked", userInfo: nil)
-			})
+		Task { @MainActor in
+			guard let activeTab = await window.activeTab() else {
+				return
+			}
+			guard let activePage = await activeTab.activePage() else {
+				return
+			}
+			activePage.dispatchMessageToScript(withName: "toolbarButtonClicked", userInfo: nil)
 		}
     }