fix dut to changed prototype of WebNotificationAllowed

YuriL180821 · Sep 25, 2022 · 1d5208c · 1d5208c
1 parent fea5321
commit 1d5208c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
@@ -439,7 +439,7 @@ absl::optional<int> ElectronBrowserClient::GetRenderFrameProcessID() {
           notifications_allowed = notifications_allowed_;
         };
         WebNotificationAllowed(
-            GetWebContentsFromProcessID(proc_id),
+            GetWebContentsFromProcessID(proc_id)->GetPrimaryMainFrame(),
             base::BindRepeating(
                 [](std::function<void(bool, bool)> process_flags_,
                    // flags below will come from WebNotificationAllowed

diff --git a/shell/browser/electron_browser_client.h b/shell/browser/electron_browser_client.h
@@ -67,7 +67,8 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
 
   NotificationPresenter* GetNotificationPresenter();
 
-  void WebNotificationAllowed(content::WebContents* web_contents,
+  void WebNotificationAllowed(content::RenderFrameHost* rfh,
+                              // content::WebContents* web_contents,
                               base::OnceCallback<void(bool, bool)> callback);
 
   // content::NavigatorDelegate

diff --git a/shell/browser/notifications/platform_notification_service.cc b/shell/browser/notifications/platform_notification_service.cc
@@ -201,7 +201,8 @@ void PlatformNotificationService::DisplayNotification(
     const bool is_persistent(false);
     const bool is_replacing(prev_notif_count > curr_notif_count);
     browser_client_->WebNotificationAllowed(
-        content::WebContents::FromRenderFrameHost(render_frame_host),
+        // content::WebContents::FromRenderFrameHost(render_frame_host),
+        render_frame_host,
         base::BindRepeating(&OnWebNotificationAllowed, notification,
                             notification_resources.notification_icon,
                             notification_resources.image, notification_data,
@@ -243,7 +244,7 @@ void PlatformNotificationService::DisplayPersistentNotification(
     const bool is_persistent(true);
     const bool is_replacing(prev_notif_count > curr_notif_count);
     browser_client_->WebNotificationAllowed(
-        web_ctx,
+        web_ctx->GetPrimaryMainFrame(),
         base::BindRepeating(&OnWebNotificationAllowed, notification,
                             notification_resources.notification_icon,
                             notification_resources.image, notification_data,