ci: Merge branch 'main'

Author: shadowfax92

packages/browseros/chromium_patches/chrome/browser/extensions/browseros_extension_constants.h

@@ -1,9 +1,9 @@
 diff --git a/chrome/browser/extensions/browseros_extension_constants.h b/chrome/browser/extensions/browseros_extension_constants.h
 new file mode 100644
-index 0000000000000..aec78219fe724
+index 0000000000000..65020a43f27e1
 --- /dev/null
 +++ b/chrome/browser/extensions/browseros_extension_constants.h
-@@ -0,0 +1,236 @@
+@@ -0,0 +1,226 @@
 +// Copyright 2024 The Chromium Authors
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -182,16 +182,6 @@ index 0000000000000..aec78219fe724
 +    {kUBlockOriginExtensionId, false, false},
 +};
 +
-+// Allowlist of BrowserOS extension IDs that are permitted to be installed.
-+// Only extensions with these IDs will be loaded from the config.
-+inline constexpr const char* kAllowedExtensions[] = {
-+    kBrowserOSExtensions[0].id,
-+    kBrowserOSExtensions[1].id,
-+    kBrowserOSExtensions[2].id,
-+    kBrowserOSExtensions[3].id,
-+    kBrowserOSExtensions[4].id,
-+};
-+
 +inline constexpr size_t kBrowserOSExtensionsCount =
 +    sizeof(kBrowserOSExtensions) / sizeof(kBrowserOSExtensions[0]);
 +

packages/browseros/chromium_patches/chrome/browser/extensions/browseros_external_loader.cc

@@ -1,9 +1,9 @@
 diff --git a/chrome/browser/extensions/browseros_external_loader.cc b/chrome/browser/extensions/browseros_external_loader.cc
 new file mode 100644
-index 0000000000000..61e57851b9178
+index 0000000000000..83c9677581de2
 --- /dev/null
 +++ b/chrome/browser/extensions/browseros_external_loader.cc
-@@ -0,0 +1,667 @@
+@@ -0,0 +1,709 @@
 +// Copyright 2024 The Chromium Authors
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -37,6 +37,7 @@ index 0000000000000..61e57851b9178
 +#include "extensions/browser/extension_prefs.h"
 +#include "extensions/browser/extension_registrar.h"
 +#include "extensions/browser/extension_registry.h"
++#include "extensions/browser/uninstall_reason.h"
 +#include "extensions/browser/extension_system.h"
 +#include "extensions/browser/pending_extension_manager.h"
 +#include "extensions/common/extension.h"
@@ -102,7 +103,7 @@ index 0000000000000..61e57851b9178
 +    config_url_ = GURL(browseros::kBrowserOSConfigUrl);
 +  }
 +
-+  for (const char* extension_id : browseros::kAllowedExtensions) {
++  for (const std::string& extension_id : browseros::GetBrowserOSExtensionIds()) {
 +    browseros_extension_ids_.insert(extension_id);
 +  }
 +}
@@ -233,20 +234,12 @@ index 0000000000000..61e57851b9178
 +  // Pass the prefs to the external provider system
 +  LoadFinished(std::move(prefs));
 +  
-+  // Immediately trigger high-priority installation of all BrowserOS extensions
-+  // This ensures they get installed right away instead of waiting for Chrome's
-+  // default external extension installation process
-+  if (!browseros_extension_ids_.empty()) {
-+    LOG(INFO) << "browseros: Triggering immediate high-priority installation for " 
-+              << browseros_extension_ids_.size() << " BrowserOS extensions";
-+    
-+    // Use a delayed task to ensure the extension system is fully initialized
-+    base::SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask(
-+        FROM_HERE,
-+        base::BindOnce(&BrowserOSExternalLoader::TriggerImmediateInstallation,
-+                       weak_ptr_factory_.GetWeakPtr()),
-+        base::Seconds(2));  // Small delay to ensure extension system is ready
-+  }
++  // Use a delayed task to ensure the extension system is fully initialized
++  base::SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask(
++      FROM_HERE,
++      base::BindOnce(&BrowserOSExternalLoader::TriggerImmediateInstallation,
++                     weak_ptr_factory_.GetWeakPtr()),
++      base::Seconds(2));
 +  
 +  // Start periodic checking after initial load
 +  StartPeriodicCheck();
@@ -276,19 +269,22 @@ index 0000000000000..61e57851b9178
 +    return;
 +  }
 +  
-+  // 1. Check for and reinstall any uninstalled BrowserOS extensions
++  // 1. Uninstall deprecated extensions (in kBrowserOSExtensions but not in server config)
++  UninstallDeprecatedExtensions();
++
++  // 2. Check for and reinstall any uninstalled BrowserOS extensions
 +  ReinstallUninstalledExtensions();
 +
-+  // 2. Re-enable any disabled BrowserOS extensions
++  // 3. Re-enable any disabled BrowserOS extensions
 +  ReenableDisabledExtensions();
 +
-+  // 3. Fetch latest config and check for changes
++  // 4. Fetch latest config and check for changes
 +  FetchAndCheckConfig();
 +
-+  // 4. Force immediate update check for all BrowserOS extensions
++  // 5. Force immediate update check for all BrowserOS extensions
 +  ForceUpdateCheck();
 +
-+  // 5. Log extension state after all maintenance attempts
++  // 6. Log extension state after all maintenance attempts
 +  CheckAndLogExtensionState("periodic_maintenance");
 +
 +  // Schedule the next maintenance
@@ -670,4 +666,50 @@ index 0000000000000..61e57851b9178
 +  }
 +}
 +
++void BrowserOSExternalLoader::UninstallDeprecatedExtensions() {
++  if (!profile_ || last_config_.empty()) {
++    return;
++  }
++
++  ExtensionRegistry* registry = ExtensionRegistry::Get(profile_);
++  if (!registry) {
++    return;
++  }
++
++  auto* registrar = ExtensionRegistrar::Get(profile_);
++  if (!registrar) {
++    return;
++  }
++
++  // Build set of extension IDs currently in server config
++  std::set<std::string> server_extension_ids;
++  for (const auto [extension_id, _] : last_config_) {
++    server_extension_ids.insert(extension_id);
++  }
++
++  // Check all BrowserOS-managed extensions
++  for (const std::string& extension_id : browseros::GetBrowserOSExtensionIds()) {
++    // Skip if extension is in server config (still wanted)
++    if (server_extension_ids.contains(extension_id)) {
++      continue;
++    }
++
++    // Check if extension is installed
++    const Extension* extension = registry->GetInstalledExtension(extension_id);
++    if (!extension) {
++      continue;
++    }
++
++    LOG(INFO) << "browseros: Uninstalling deprecated extension " << extension_id;
++
++    std::u16string error;
++    if (!registrar->UninstallExtension(extension_id,
++                                       UNINSTALL_REASON_ORPHANED_EXTERNAL_EXTENSION,
++                                       &error)) {
++      LOG(WARNING) << "browseros: Failed to uninstall deprecated extension "
++                   << extension_id << ": " << error;
++    }
++  }
++}
++
 +}  // namespace extensions

packages/browseros/chromium_patches/chrome/browser/extensions/browseros_external_loader.h

@@ -1,9 +1,9 @@
 diff --git a/chrome/browser/extensions/browseros_external_loader.h b/chrome/browser/extensions/browseros_external_loader.h
 new file mode 100644
-index 0000000000000..dc70fac86ca0a
+index 0000000000000..d5e6384343492
 --- /dev/null
 +++ b/chrome/browser/extensions/browseros_external_loader.h
-@@ -0,0 +1,123 @@
+@@ -0,0 +1,128 @@
 +// Copyright 2024 The Chromium Authors
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -95,6 +95,11 @@ index 0000000000000..dc70fac86ca0a
 +  // Checks extension state and logs to metrics if not enabled
 +  void CheckAndLogExtensionState(const std::string& context);
 +
++  // Uninstalls extensions that are in kAllBrowserOSExtensions but not in
++  // the current server config (extensions.json). This handles cleanup of
++  // deprecated extensions for users upgrading from older versions.
++  void UninstallDeprecatedExtensions();
++
 +  // The profile associated with this loader.
 +  raw_ptr<Profile> profile_;
 +

packages/browseros/chromium_patches/chrome/browser/extensions/chrome_extension_registrar_delegate.cc

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/extensions/chrome_extension_registrar_delegate.cc b/chrome/browser/extensions/chrome_extension_registrar_delegate.cc
-index 6eec0585e8925..bf19269ade03a 100644
+index 6eec0585e8925..eb5f9e8573b82 100644
 --- a/chrome/browser/extensions/chrome_extension_registrar_delegate.cc
 +++ b/chrome/browser/extensions/chrome_extension_registrar_delegate.cc
 @@ -12,6 +12,7 @@
@@ -10,17 +10,15 @@ index 6eec0585e8925..bf19269ade03a 100644
  #include "chrome/browser/extensions/component_loader.h"
  #include "chrome/browser/extensions/corrupted_extension_reinstaller.h"
  #include "chrome/browser/extensions/data_deleter.h"
-@@ -317,6 +318,15 @@ bool ChromeExtensionRegistrarDelegate::CanDisableExtension(
+@@ -317,6 +318,13 @@ bool ChromeExtensionRegistrarDelegate::CanDisableExtension(
      return true;
    }
 
 +  // - BrowserOS extensions cannot be disabled by users
-+  for (const char* allowed_id : browseros::kAllowedExtensions) {
-+    if (extension->id() == allowed_id) {
-+      LOG(INFO) << "browseros: Extension " << extension->id() 
-+                << " cannot be disabled (BrowserOS extension)";
-+      return false;
-+    }
++  if (browseros::IsBrowserOSExtension(extension->id())) {
++    LOG(INFO) << "browseros: Extension " << extension->id()
++              << " cannot be disabled (BrowserOS extension)";
++    return false;
 +  }
 +
    // - Shared modules are just resources used by other extensions, and are not

packages/browseros/chromium_patches/chrome/browser/extensions/extension_web_ui_override_registrar.cc

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/extensions/extension_web_ui_override_registrar.cc b/chrome/browser/extensions/extension_web_ui_override_registrar.cc
-index 7b48bcb950bad..4e7750c2a6112 100644
+index 7b48bcb950bad..73f7c36fd3a7c 100644
 --- a/chrome/browser/extensions/extension_web_ui_override_registrar.cc
 +++ b/chrome/browser/extensions/extension_web_ui_override_registrar.cc
 @@ -6,7 +6,9 @@
@@ -12,7 +12,7 @@ index 7b48bcb950bad..4e7750c2a6112 100644
  #include "chrome/browser/extensions/extension_web_ui.h"
  #include "chrome/browser/profiles/profile.h"
  #include "extensions/browser/extension_system.h"
-@@ -32,15 +34,29 @@ ExtensionWebUIOverrideRegistrar::~ExtensionWebUIOverrideRegistrar() = default;
+@@ -32,15 +34,20 @@ ExtensionWebUIOverrideRegistrar::~ExtensionWebUIOverrideRegistrar() = default;
  void ExtensionWebUIOverrideRegistrar::OnExtensionLoaded(
      content::BrowserContext* browser_context,
      const Extension* extension) {
@@ -26,16 +26,7 @@ index 7b48bcb950bad..4e7750c2a6112 100644
    if (!overrides.empty()) {
 -    for (auto& observer : observer_list_) {
 -      observer.OnExtensionOverrideAdded(*extension);
-+    // Check if this is a BrowserOS extension
-+    bool is_browseros_extension = false;
-+    for (const char* allowed_id : browseros::kAllowedExtensions) {
-+      if (extension->id() == allowed_id) {
-+        is_browseros_extension = true;
-+        break;
-+      }
-+    }
-+
-+    if (!is_browseros_extension) {
++    if (!browseros::IsBrowserOSExtension(extension->id())) {
 +      // disable other extensions from overriding Chrome URLs
 +      return;
      }

packages/browseros/chromium_patches/chrome/browser/resources/settings/settings_main/settings_main.html

@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/settings_main/settings_main.html b/chrome/browser/resources/settings/settings_main/settings_main.html
-index e91a42678789f..defdc535cdeeb 100644
+index e91a42678789f..b45aab13e278c 100644
 --- a/chrome/browser/resources/settings/settings_main/settings_main.html
 +++ b/chrome/browser/resources/settings/settings_main/settings_main.html
-@@ -228,4 +228,34 @@
+@@ -228,4 +228,24 @@
        </settings-about-page>
      </template>
    </div>
@@ -17,16 +17,6 @@
 +    </template>
 +  </div>
 +
-+  <div slot="view" id="browseros">
-+    <template is="dom-if" if="[[renderPlugin_(
-+        routes_.BROWSEROS, lastRoute_, inSearchMode_)]]">
-+      <settings-browseros-page role="main"
-+          class="cr-centered-card-container"
-+          prefs="{{prefs}}">
-+      </settings-browseros-page>
-+    </template>
-+  </div>
-+
 +  <div slot="view" id="browserosPrefs">
 +    <template is="dom-if" if="[[renderPlugin_(
 +        routes_.BROWSEROS_PREFS, lastRoute_, inSearchMode_)]]">

packages/browseros/chromium_patches/chrome/browser/ui/browser_actions.cc

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/browser_actions.cc b/chrome/browser/ui/browser_actions.cc
-index fb3dba200be8c..29d60f64eab67 100644
+index fb3dba200be8c..85429c5ab0acf 100644
 --- a/chrome/browser/ui/browser_actions.cc
 +++ b/chrome/browser/ui/browser_actions.cc
 @@ -12,6 +12,7 @@
@@ -10,19 +10,21 @@ index fb3dba200be8c..29d60f64eab67 100644
  #include "chrome/app/vector_icons/vector_icons.h"
  #include "chrome/browser/devtools/devtools_window.h"
  #include "chrome/browser/prefs/incognito_mode_prefs.h"
-@@ -20,6 +21,11 @@
+@@ -20,6 +21,13 @@
  #include "chrome/browser/sharing_hub/sharing_hub_features.h"
  #include "chrome/browser/ui/actions/chrome_action_id.h"
  #include "chrome/browser/ui/actions/chrome_actions.h"
 +#include "chrome/browser/extensions/api/side_panel/side_panel_service.h"
 +#include "chrome/browser/extensions/browseros_extension_constants.h"
 +#include "chrome/browser/extensions/extension_tab_util.h"
++#include "chrome/browser/infobars/simple_alert_infobar_creator.h"
++#include "components/infobars/content/content_infobar_manager.h"
 +#include "chrome/browser/ui/extensions/extension_side_panel_utils.h"
 +#include "extensions/browser/extension_registry.h"
  #include "chrome/browser/ui/autofill/address_bubbles_icon_controller.h"
  #include "chrome/browser/ui/autofill/autofill_bubble_base.h"
  #include "chrome/browser/ui/autofill/payments/mandatory_reauth_bubble_controller_impl.h"
-@@ -253,6 +259,97 @@ void BrowserActions::InitializeBrowserActions() {
+@@ -253,6 +261,110 @@ void BrowserActions::InitializeBrowserActions() {
              .Build());
    }
 
@@ -80,6 +82,19 @@ index fb3dba200be8c..29d60f64eab67 100644
 +                        .GetByID(extensions::browseros::kAgentV2ExtensionId);
 +                if (!extension) {
 +                  LOG(WARNING) << "browseros: Agent extension not found";
++                  infobars::ContentInfoBarManager* infobar_manager =
++                      infobars::ContentInfoBarManager::FromWebContents(contents);
++                  if (infobar_manager) {
++                    CreateSimpleAlertInfoBar(
++                        infobar_manager,
++                        infobars::InfoBarDelegate::
++                            BROWSEROS_AGENT_INSTALLING_INFOBAR_DELEGATE,
++                        nullptr,
++                        u"BrowserOS Agent is installing/updating. Please try again shortly.",
++                        /*auto_expire=*/true,
++                        /*should_animate=*/true,
++                        /*closeable=*/true);
++                  }
 +                  return;
 +                }
 +

packages/browseros/chromium_patches/chrome/browser/ui/browser_command_controller.cc

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
-index deb531f8832e3..977d40cf6ff10 100644
+index deb531f8832e3..78591a95b2bc7 100644
 --- a/chrome/browser/ui/browser_command_controller.cc
 +++ b/chrome/browser/ui/browser_command_controller.cc
 @@ -70,6 +70,8 @@
@@ -11,19 +11,21 @@ index deb531f8832e3..977d40cf6ff10 100644
  #include "chrome/browser/ui/web_applications/app_browser_controller.h"
  #include "chrome/browser/ui/web_applications/web_app_dialog_utils.h"
  #include "chrome/browser/ui/web_applications/web_app_launch_utils.h"
-@@ -104,7 +106,11 @@
+@@ -104,7 +106,13 @@
  #include "content/public/browser/web_contents_observer.h"
  #include "content/public/common/profiling.h"
  #include "content/public/common/url_constants.h"
 +#include "chrome/browser/extensions/api/side_panel/side_panel_service.h"
 +#include "chrome/browser/extensions/browseros_extension_constants.h"
 +#include "chrome/browser/extensions/extension_tab_util.h"
++#include "chrome/browser/infobars/simple_alert_infobar_creator.h"
++#include "components/infobars/content/content_infobar_manager.h"
  #include "extensions/browser/extension_registrar.h"
 +#include "extensions/browser/extension_registry.h"
  #include "extensions/common/extension_urls.h"
  #include "printing/buildflags/buildflags.h"
  #include "ui/actions/actions.h"
-@@ -988,6 +994,58 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
+@@ -988,6 +996,71 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
        browser_->GetFeatures().side_panel_ui()->Show(
            SidePanelEntryId::kBookmarks, SidePanelOpenTrigger::kAppMenu);
        break;
@@ -67,6 +69,19 @@ index deb531f8832e3..977d40cf6ff10 100644
 +              ->enabled_extensions()
 +              .GetByID(extensions::browseros::kAgentV2ExtensionId);
 +      if (!extension) {
++        infobars::ContentInfoBarManager* infobar_manager =
++            infobars::ContentInfoBarManager::FromWebContents(active_contents);
++        if (infobar_manager) {
++          CreateSimpleAlertInfoBar(
++              infobar_manager,
++              infobars::InfoBarDelegate::
++                  BROWSEROS_AGENT_INSTALLING_INFOBAR_DELEGATE,
++              nullptr,
++              u"BrowserOS Agent is installing/updating. Please try again shortly.",
++              /*auto_expire=*/true,
++              /*should_animate=*/true,
++              /*closeable=*/true);
++        }
 +        break;
 +      }
 +      extensions::SidePanelService* service =
@@ -82,7 +97,7 @@ index deb531f8832e3..977d40cf6ff10 100644
      case IDC_SHOW_APP_MENU:
        base::RecordAction(base::UserMetricsAction("Accel_Show_App_Menu"));
        ShowAppMenu(browser_);
-@@ -1648,6 +1706,13 @@ void BrowserCommandController::InitCommandState() {
+@@ -1648,6 +1721,13 @@ void BrowserCommandController::InitCommandState() {
    }
 
    command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_SIDE_PANEL, true);