From 6933105480d7e22ef4b21fd1e1594e69f8bea410 Mon Sep 17 00:00:00 2001
From: Dana Fried <[email protected]>
Date: Tue, 21 Jul 2026 14:00:20 -0700
Subject: [PATCH] [Tabbed Web App] Fix spurious incorrect origin text flash

This disables the origin text flash on tabbed PWAs when the user
switches tabs; it was previously causing a spurious flash of the wrong
text any time the user changed tabs and a new page loaded.

Explanation in the code.

Fixed: 517487890
Change-Id: I6c598f7c7137df68f56af2b5e84020541a7add28
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/8124935
Reviewed-by: Dibyajyoti Pal <[email protected]>
Commit-Queue: Dana Fried <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1665775}
---

diff --git a/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_origin_text.cc b/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_origin_text.cc
index bcd04650..b8cc178c 100644
--- a/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_origin_text.cc
+++ b/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_origin_text.cc
@@ -46,7 +46,7 @@
   SetLayoutManager(std::make_unique<views::FillLayout>());
 
   label_ = std::make_unique<views::Label>(
-               origin_text_, ChromeTextContext::CONTEXT_DIALOG_BODY_TEXT_SMALL,
+               u"", ChromeTextContext::CONTEXT_DIALOG_BODY_TEXT_SMALL,
                views::style::STYLE_EMPHASIZED)
                .release();
   label_->SetElideBehavior(gfx::ELIDE_HEAD);
@@ -129,13 +129,13 @@
 void WebAppOriginText::OnLayerAnimationEnded(
     ui::LayerAnimationSequence* sequence) {
   SetVisible(false);
-  last_completed_animation_text_for_testing_ = origin_text_;
+  last_completed_animation_text_for_testing_ = label_->GetText();
 }
 
 void WebAppOriginText::OnLayerAnimationAborted(
     ui::LayerAnimationSequence* sequence) {
   SetVisible(false);
-  last_completed_animation_text_for_testing_ = origin_text_;
+  last_completed_animation_text_for_testing_ = label_->GetText();
 }
 
 std::u16string_view WebAppOriginText::GetLabelTextForTesting() const {
@@ -149,6 +149,15 @@
     const TabStripSelectionChange& selection) {
   if (selection.active_tab_changed() && !tab_strip_model->empty()) {
     Observe(selection.new_contents);
+    // Don't do anything if this is the original tab loading in. The text will
+    // be shown on navigation complete.
+    const bool is_startup = !selection.old_contents;
+    if (!is_startup) {
+      // In tabbed PWAs, the new tab might be from a different origin, in which
+      // case we don't want to accidentally show the previous tab's or the app's
+      // origin in the label. Update the text appropriately.
+      MaybeUpdateAndShowText(selection.new_contents);
+    }
   }
 }
 
@@ -156,26 +165,32 @@
   if (!handle->IsInPrimaryMainFrame() || handle->IsSameDocument()) {
     return;
   }
-  content::WebContents* web_contents = handle->GetWebContents();
-  if (!web_contents) {
+  MaybeUpdateAndShowText(handle->GetWebContents());
+}
+
+void WebAppOriginText::MaybeUpdateAndShowText(
+    const content::WebContents* new_contents) {
+  if (!new_contents) {
     return;
   }
-  BrowserWindowInterface* browser =
-      GlobalBrowserCollection::GetInstance()->FindBrowserWithTab(web_contents);
+  BrowserWindowInterface* const browser =
+      GlobalBrowserCollection::GetInstance()->FindBrowserWithTab(new_contents);
   if (!browser) {
     return;
   }
-  web_app::AppBrowserController* app_controller =
+  const web_app::AppBrowserController* const app_controller =
       web_app::AppBrowserController::From(browser);
   if (!app_controller) {
     return;
   }
-  std::u16string new_origin_text = app_controller->GetLaunchFlashText();
-  if (new_origin_text.empty() || new_origin_text == origin_text_) {
+  const std::u16string new_origin_text = app_controller->GetLaunchFlashText();
+  if (new_origin_text.empty() || new_origin_text == label_->GetText()) {
     return;
   }
-  origin_text_ = std::move(new_origin_text);
-  label_->SetText(origin_text_);
+  // Note: this will also update the accessible name via the
+  // `UpdateAccessibleName()` callback.
+  label_->SetText(new_origin_text);
+
   // CCT UI already displays origin information so there is no need to animate
   // origin text.
   // TODO(crbug.com/40282543): Instead of DidFinishNavigation, we can use
@@ -187,6 +202,7 @@
     label_->layer()->GetAnimator()->StopAnimating();
     return;
   }
+
   StartFadeAnimation();
 }
 
diff --git a/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_origin_text.h b/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_origin_text.h
index 264bc82..a8edbbc 100644
--- a/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_origin_text.h
+++ b/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_origin_text.h
@@ -70,10 +70,10 @@
   // content::WebContentsObserver:
   void DidFinishNavigation(content::NavigationHandle* handle) override;
 
-  void UpdateAccessibleName();
+  // May update the text based on the `new_contents`.
+  void MaybeUpdateAndShowText(const content::WebContents* new_contents);
 
-  // origin_text_ is populated by ReadyToCommitNavigation.
-  std::u16string origin_text_;
+  void UpdateAccessibleName();
 
   // Disallow animation until the parent view animates for the first time. This
   // helps respect the animation start delay in WebAppToolbarButtonContainer.