fix: Fixed linking error for StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent with chrome.lib

Author: martin-world1977

chromium_src/BUILD.gn

@@ -318,6 +318,8 @@ static_library("chrome") {
       "//chrome/renderer/extensions/extension_hooks_delegate.h",
       "//chrome/renderer/extensions/tabs_hooks_delegate.cc",
       "//chrome/renderer/extensions/tabs_hooks_delegate.h",
+      "//electron/shell/browser/extensions/api/streams_private/streams_private_api.cc",
+      "//electron/shell/browser/extensions/api/streams_private/streams_private_api.h",
     ]
 
     if (enable_pdf_viewer) {

filenames.gni

@@ -736,8 +736,8 @@ filenames = {
     "shell/browser/extensions/api/resources_private/resources_private_api.h",
     "shell/browser/extensions/api/runtime/electron_runtime_api_delegate.cc",
     "shell/browser/extensions/api/runtime/electron_runtime_api_delegate.h",
-    "shell/browser/extensions/api/streams_private/streams_private_api.cc",
-    "shell/browser/extensions/api/streams_private/streams_private_api.h",
+    # "shell/browser/extensions/api/streams_private/streams_private_api.cc",
+    # "shell/browser/extensions/api/streams_private/streams_private_api.h",
     "shell/browser/extensions/api/tabs/tabs_api.cc",
     "shell/browser/extensions/api/tabs/tabs_api.h",
     "shell/browser/extensions/electron_browser_context_keyed_service_factories.cc",

shell/browser/electron_browser_context.cc

@@ -36,6 +36,7 @@
 #include "services/network/public/cpp/features.h"
 #include "services/network/public/cpp/wrapper_shared_url_loader_factory.h"
 #include "services/network/public/mojom/network_context.mojom.h"
+#include "shell/browser/api/electron_api_web_contents.h"
 #include "shell/browser/cookie_change_notifier.h"
 #include "shell/browser/electron_browser_client.h"
 #include "shell/browser/electron_browser_main_parts.h"
@@ -392,6 +393,13 @@ ElectronBrowserContext::GetStorageNotificationService() {
   return nullptr;
 }
 
+int ElectronBrowserContext::GetWebContentsTabId(content::WebContents* web_contents) {
+  auto* api_contents = electron::api::WebContents::From(web_contents);
+  if (api_contents)
+    return api_contents->ID();
+  return -1;
+}
+
 ResolveProxyHelper* ElectronBrowserContext::GetResolveProxyHelper() {
   if (!resolve_proxy_helper_) {
     resolve_proxy_helper_ = base::MakeRefCounted<ResolveProxyHelper>(this);

shell/browser/electron_browser_context.h

@@ -13,11 +13,12 @@
 #include "chrome/browser/predictors/preconnect_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/resource_context.h"
+#include "content/public/browser/web_contents.h"
 #include "electron/buildflags/buildflags.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "services/network/public/mojom/network_context.mojom.h"
 #include "services/network/public/mojom/url_loader_factory.mojom.h"
-#include "shell/browser/media/media_device_id_salt.h"
+#include "electron/shell/browser/media/media_device_id_salt.h"
 
 class PrefService;
 class ValueMapPrefStore;
@@ -46,7 +47,12 @@ class ResolveProxyHelper;
 class WebViewManager;
 class ProtocolRegistry;
 
-class ElectronBrowserContext : public content::BrowserContext {
+class ElectronBrowserContextBase : public content::BrowserContext {
+ public:
+  virtual int GetWebContentsTabId(content::WebContents* web_contents) = 0;
+};
+
+class ElectronBrowserContext : public ElectronBrowserContextBase {
  public:
   // disable copy
   ElectronBrowserContext(const ElectronBrowserContext&) = delete;
@@ -116,6 +122,8 @@ class ElectronBrowserContext : public content::BrowserContext {
       override;
   content::StorageNotificationService* GetStorageNotificationService() override;
 
+  int GetWebContentsTabId(content::WebContents* web_contents) override;
+
   CookieChangeNotifier* cookie_change_notifier() const {
     return cookie_change_notifier_.get();
   }

shell/browser/extensions/api/streams_private/streams_private_api.cc

@@ -10,15 +10,15 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
+#include "electron/shell/browser/electron_browser_context.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.h"
 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
 #include "extensions/common/manifest_handlers/mime_types_handler.h"
-#include "shell/browser/api/electron_api_web_contents.h"
+// #include "shell/browser/api/electron_api_web_contents.h"
 
 namespace extensions {
 
-#if 0
 void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
     const std::string& extension_id,
     const std::string& stream_id,
@@ -52,15 +52,20 @@ void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
       extensions::Extension::GetBaseURLFromExtensionId(extension_id).spec() +
       handler->handler_url());
   int tab_id = -1;
+#if 0
   auto* api_contents = electron::api::WebContents::From(web_contents);
   if (api_contents)
     tab_id = api_contents->ID();
+#else
+  auto* electron_browser_context =
+      static_cast<electron::ElectronBrowserContextBase*>(browser_context);
+  tab_id = electron_browser_context->GetWebContentsTabId(web_contents);
+#endif
   auto stream_container = std::make_unique<extensions::StreamContainer>(
       tab_id, embedded, handler_url, extension_id,
       std::move(transferrable_loader), original_url);
   extensions::MimeHandlerStreamManager::Get(browser_context)
       ->AddStream(stream_id, std::move(stream_container), frame_tree_node_id);
 }
-#endif  // 0
 
 }  // namespace extensions

shell/browser/extensions/api/streams_private/streams_private_api.h

@@ -26,7 +26,7 @@ class StreamsPrivateAPI {
       bool embedded,
       int frame_tree_node_id,
       blink::mojom::TransferrableURLLoaderPtr transferrable_loader,
-      const GURL& original_url) {}
+      const GURL& original_url);
 };
 
 }  // namespace extensions