cobalt: Only observe WebContents on main app

borongc · borongc · commit ec7eb6647061 · 2025-11-03T19:39:45.000-08:00
Issue: 441738743
diff --git a/cobalt/browser/cobalt_content_browser_client.cc b/cobalt/browser/cobalt_content_browser_client.cc
@@ -37,6 +37,7 @@
 #include "cobalt/shell/browser/shell.h"
 #include "cobalt/shell/browser/shell_paths.h"
 #include "cobalt/shell/common/shell_switches.h"
+#include "cobalt/shell/common/url_constants.h"
 #include "components/metrics/metrics_state_manager.h"
 #include "components/metrics_services_manager/metrics_services_manager.h"
 #include "components/prefs/pref_registry_simple.h"
@@ -298,6 +299,12 @@ void CobaltContentBrowserClient::ConfigureNetworkContextParams(
 void CobaltContentBrowserClient::OnWebContentsCreated(
     content::WebContents* web_contents) {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+  if (web_contents->GetPrimaryMainFrame() &&
+      web_contents->GetPrimaryMainFrame()->GetFrameName() ==
+          content::kCobaltSplashMainFrameName) {
+    // Don't observe and delegate WebContents if it's splash screen.
+    return;
+  }
   web_contents_observer_.reset(new CobaltWebContentsObserver(web_contents));
   web_contents_delegate_.reset(new CobaltWebContentsDelegate());
   content::Shell::SetShellCreatedCallback(base::BindOnce(
diff --git a/cobalt/shell/browser/shell.cc b/cobalt/shell/browser/shell.cc
@@ -239,8 +239,22 @@ gfx::Size Shell::AdjustWindowSize(const gfx::Size& initial_size) {
 Shell* Shell::CreateNewWindow(BrowserContext* browser_context,
                               const GURL& url,
                               const scoped_refptr<SiteInstance>& site_instance,
-                              const gfx::Size& initial_size) {
+                              const gfx::Size& initial_size,
+                              const std::string& main_frame_name) {
   WebContents::CreateParams create_params(browser_context, site_instance);
+#if BUILDFLAG(IS_ANDROID)
+  // Workaround to determine if WebContents is for main app or splash screen.
+  // As a result, CobaltContentBrowserClient::OnWebContentsCreated() only
+  // observes WebContents on main app.
+  if (!main_frame_name.empty()) {
+    // Set |main_frame_name| for splash screen, where
+    // ShellBrowserMainParts::InitializeMessageLoopContext() creates
+    // WebContents, and it loads splash screen. On the other hand,
+    // JNI_ShellManager_LaunchShell() should not set |main_frame_name|.
+    create_params.main_frame_name = main_frame_name;
+  }
+#endif  // BUILDFLAG(IS_ANDROID)
+
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kForcePresentationReceiverForTesting)) {
     create_params.starting_sandbox_flags = kPresentationReceiverSandboxFlags;
diff --git a/cobalt/shell/browser/shell.h b/cobalt/shell/browser/shell.h
@@ -91,7 +91,8 @@ class Shell : public WebContentsDelegate, public WebContentsObserver {
       BrowserContext* browser_context,
       const GURL& url,
       const scoped_refptr<SiteInstance>& site_instance,
-      const gfx::Size& initial_size);
+      const gfx::Size& initial_size,
+      const std::string& main_frame_name = "");
 
   // Returns the Shell object corresponding to the given WebContents.
   static Shell* FromWebContents(WebContents* web_contents);
diff --git a/cobalt/shell/browser/shell_browser_main_parts.cc b/cobalt/shell/browser/shell_browser_main_parts.cc
@@ -35,6 +35,7 @@
 #include "cobalt/shell/browser/shell_devtools_manager_delegate.h"
 #include "cobalt/shell/browser/shell_platform_delegate.h"
 #include "cobalt/shell/common/shell_switches.h"
+#include "cobalt/shell/common/url_constants.h"
 #include "components/performance_manager/embedder/graph_features.h"
 #include "components/performance_manager/embedder/performance_manager_lifetime.h"
 #include "content/public/browser/browser_thread.h"
@@ -142,7 +143,7 @@ void ShellBrowserMainParts::InitializeBrowserContexts() {
 
 void ShellBrowserMainParts::InitializeMessageLoopContext() {
   Shell::CreateNewWindow(browser_context_.get(), GetStartupURL(), nullptr,
-                         gfx::Size());
+                         gfx::Size(), kCobaltSplashMainFrameName);
 }
 
 void ShellBrowserMainParts::ToolkitInitialized() {
diff --git a/cobalt/shell/common/url_constants.h b/cobalt/shell/common/url_constants.h
@@ -19,6 +19,8 @@ namespace content {
 
 inline constexpr char kH5vccEmbeddedScheme[] = "h5vcc-embedded";
 
+inline constexpr char kCobaltSplashMainFrameName[] = "Splash";
+
 }  // namespace content
 
 #endif  // COBALT_SHELL_COMMON_URL_CONSTANTS_H_
