Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 879d836c authored by uazo's avatar uazo Committed by github-actions[bot]
Browse files

[AUTO][FILECONTROL] - version

parent 416bb7c5
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
146.0.7680.31
146.0.7680.111
+59 −23
Original line number Diff line number Diff line
@@ -4528,28 +4528,50 @@ const FeatureEntry::FeatureVariation kAndroidDesktopZoomScalingVariations[] = {
     nullptr}};
#endif  // BUILDFLAG(IS_ANDROID)
const FeatureEntry::FeatureParam kContextualTaskPermanentButton[] = {
    {"ContextualTasksEntryPoint", "toolbar-permanent"}};
const FeatureEntry::FeatureParam kContextualTaskEphemeralButton[] = {
    {"ContextualTasksEntryPoint", "toolbar-revisit"}};
const FeatureEntry::FeatureParam kContextualTaskPageAction[] = {
    {"ContextualTasksEntryPoint", "page-action-revisit"}};
const FeatureEntry::FeatureParam kContextualTaskDisableSidePanel[] = {
    {"ContextualTasksEntryPoint", "toolbar-revisit"},
// LINT.IfChange(ContextualTasksArms)
const FeatureEntry::FeatureParam kArm1FullBundleWithExpandoButton[] = {
    {"ContextualTasksExpandButtonOptions", "side-panel-expand-button"}};
const FeatureEntry::FeatureParam
    kArm2FullBundleNoAutoSidePanelOpenWithExpandoButton[] = {
        {"ContextualTasksExpandButtonOptions", "side-panel-expand-button"},
        {"ContextualTasksOpenSidePanelOnLinkClicked", "false"}};
const FeatureEntry::FeatureParam kContextualTaskDisableLens[] = {
    {"ContextualTasksEntryPoint", "toolbar-revisit"},
const FeatureEntry::FeatureParam
    kArm3FullBundleWithoutLensMigrationWithExpandoButton[] = {
        {"ContextualTasksExpandButtonOptions", "side-panel-expand-button"},
        {"ContextualTasksEnableLensInContextualTasks", "false"}};
const FeatureEntry::FeatureParam
    kArm4FullBundleNoAutoAddedContextInSidePanelWithExpandoButton[] = {
        {"ContextualTasksExpandButtonOptions", "side-panel-expand-button"},
        {"ContextualTasksTabAutoSuggestionChipEnabled", "false"}};
const FeatureEntry::FeatureParam kArm5FullBundleWithCloseToExpandButton[] = {
    {"ContextualTasksExpandButtonOptions", "toolbar-close-button"}};
const FeatureEntry::FeatureParam
    kArm6FullBundleWithoutLensMigrationWithCloseToExpandButton[] = {
        {"ContextualTasksExpandButtonOptions", "toolbar-close-button"},
        {"ContextualTasksEnableLensInContextualTasks", "false"}};
const FeatureEntry::FeatureParam
    kArm7FullBundleNoAutoAddedContextInSidePanelWithCloseToExpandButton[] = {
        {"ContextualTasksExpandButtonOptions", "toolbar-close-button"},
        {"ContextualTasksTabAutoSuggestionChipEnabled", "false"}};
const FeatureEntry::FeatureVariation kContextualTaskEntryPointVariations[] = {
    {"Arm 1: Full bundle with ephemeral toolbar button",
     kContextualTaskEphemeralButton, nullptr},
    {"Arm 2: Full bundle, without AIM link clicks opening side panel",
     kContextualTaskDisableSidePanel, nullptr},
    {"Arm 3: Full bundle, without Lens migration", kContextualTaskDisableLens,
const FeatureEntry::FeatureVariation kContextualTasksVariations[] = {
    {"Arm 1: Full bundle with expando button", kArm1FullBundleWithExpandoButton,
     nullptr},
    {"permanent toolbar button", kContextualTaskPermanentButton, nullptr},
    {"page action chip", kContextualTaskPageAction, nullptr}};
    {"Arm 2: Full bundle, no auto side panel open, expando button",
     kArm2FullBundleNoAutoSidePanelOpenWithExpandoButton, nullptr},
    {"Arm 3: Full bundle, without Lens migration, expando button",
     kArm3FullBundleWithoutLensMigrationWithExpandoButton, nullptr},
    {"Arm 4: Full bundle, No auto added context in side panel, expando button",
     kArm4FullBundleNoAutoAddedContextInSidePanelWithExpandoButton, nullptr},
    {"Arm 5: Full bundle with close to expand button",
     kArm5FullBundleWithCloseToExpandButton, nullptr},
    {"Arm 6: Full bundle, without Lens migration, close to expand button",
     kArm6FullBundleWithoutLensMigrationWithCloseToExpandButton, nullptr},
    {"Arm 7: Full bundle, No auto added context in side panel, close to expand "
     "button",
     kArm7FullBundleNoAutoAddedContextInSidePanelWithCloseToExpandButton,
     nullptr}};
// LINT.ThenChange(chrome/browser/contextual_tasks/contextual_tasks_side_panel_coordinator.cc)
const FeatureEntry::FeatureParam kTaskScopedSidePanel[] = {
    {"ContextualTasksTaskScopedSidePanel", "true"}};
@@ -7723,6 +7745,11 @@ const FeatureEntry kFeatureEntries[] = {
     flag_descriptions::kShowForceRespectUiGainsToggleName,
     flag_descriptions::kShowForceRespectUiGainsToggleDescription, kOsCrOS,
     FEATURE_VALUE_TYPE(media::kShowForceRespectUiGainsToggle)},
    {"audio-flexible-loopback-for-system-loopback",
     flag_descriptions::kAudioFlexibleLoopbackForSystemLoopbackName,
     flag_descriptions::kAudioFlexibleLoopbackForSystemLoopbackDescription,
     kOsCrOS,
     FEATURE_VALUE_TYPE(media::kAudioFlexibleLoopbackForSystemLoopback)},
    {"show-spatial-audio-toggle",
     flag_descriptions::kShowSpatialAudioToggleName,
     flag_descriptions::kShowSpatialAudioToggleDescription, kOsCrOS,
@@ -9517,6 +9544,12 @@ const FeatureEntry kFeatureEntries[] = {
     FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kWebUIOmniboxPopupDebug,
                                    kWebUIOmniboxPopupDebugVariations,
                                    "WebUIOmniboxPopupDebugVariations")},
    {"webui-omnibox-popup-selection-control",
     flag_descriptions::kWebUIOmniboxPopupSelectionControlName,
     flag_descriptions::kWebUIOmniboxPopupSelectionControlDescription,
     kOsDesktop,
     FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopupSelectionControl)},
#endif  // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_CHROMEOS)
@@ -10736,7 +10769,7 @@ const FeatureEntry kFeatureEntries[] = {
     FEATURE_VALUE_TYPE(features::kGlicActorAutofill)},
    {"glic-actor-cursor", flag_descriptions::kGlicActorCursorName,
     flag_descriptions::kGlicActorCursorDescription, kOsDesktop,
     FEATURE_VALUE_TYPE(features::kGlicActorUiOverlayMagicCursor)},
     FEATURE_VALUE_TYPE(features::kGlicActorUiMagicCursor)},
    {"glic-detached", flag_descriptions::kGlicDetachedName,
     flag_descriptions::kGlicDetachedDescription, kOsDesktop,
     FEATURE_VALUE_TYPE(features::kGlicDetached)},
@@ -10810,6 +10843,9 @@ const FeatureEntry kFeatureEntries[] = {
    {"glic-capture-region", flag_descriptions::kGlicCaptureRegionName,
     flag_descriptions::kGlicCaptureRegionDescription, kOsAll,
     FEATURE_VALUE_TYPE(features::kGlicCaptureRegion)},
    {"glic-chrome-status-icon", flag_descriptions::kGlicChromeStatusIconName,
     flag_descriptions::kGlicChromeStatusIconDescription, kOsMac,
     FEATURE_VALUE_TYPE(features::kGlicChromeStatusIcon)},
    {"glic-daisy-chain-new-tabs", flag_descriptions::kGlicDaisyChainNewTabsName,
     flag_descriptions::kGlicDaisyChainNewTabsDescription, kOsDesktop,
     FEATURE_VALUE_TYPE(features::kGlicDaisyChainNewTabs)},
@@ -12202,7 +12238,7 @@ const FeatureEntry kFeatureEntries[] = {
     contextual_tasks::flag_descriptions::kContextualTasksDescription,
     kOsDesktop,
     FEATURE_WITH_PARAMS_VALUE_TYPE(contextual_tasks::kContextualTasks,
                                    kContextualTaskEntryPointVariations,
                                    kContextualTasksVariations,
                                    "ContextualTasks")},
    {"omnibox-debug-logs", omnibox::flag_descriptions::kOmniboxDebugLogsName,
+18 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@
#include "build/build_config.h"
#include "build/buildflag.h"
#include "chrome/browser/actor/actor_navigation_throttle.h"
#include "chrome/browser/autocomplete/aim_eligibility_refresh_navigation_throttle.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/custom_handlers/chrome_protocol_handler_navigation_throttle.h"
#include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
@@ -176,6 +177,10 @@
#include "extensions/browser/extensions_browser_client.h"
#endif  // BUILDFLAG(ENABLE_EXTENSIONS_CORE)

#if BUILDFLAG(ENABLE_GLIC)
#include "chrome/browser/glic/glic_navigation_throttle.h"
#endif  // BUILDFLAG(ENABLE_GLIC)

namespace {

// Wrapper for SSLErrorHandler::HandleSSLError() that supplies //chrome-level
@@ -453,8 +458,15 @@ void CreateAndAddChromeThrottlesForNavigation(
#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
        // BUILDFLAG(IS_CHROMEOS)

  // AimEligibilityRefreshNavigationThrottle must be registered before
  // ContextualTasksNavigationThrottle so it can detect AIM URL navigations
  // before ContextualTasksNavigationThrottle intercepts them.
  AimEligibilityRefreshNavigationThrottle::MaybeCreateAndAdd(registry);

#if !BUILDFLAG(IS_ANDROID)
  if (base::FeatureList::IsEnabled(contextual_tasks::kContextualTasks)) {
  if (base::FeatureList::IsEnabled(contextual_tasks::kContextualTasks) ||
      base::FeatureList::IsEnabled(
          contextual_tasks::kContextualTasksUrlRedirectToAimUrl)) {
    contextual_tasks::ContextualTasksNavigationThrottle::MaybeCreateAndAdd(
        registry);
  }
@@ -591,10 +603,15 @@ void CreateAndAddChromeThrottlesForNavigation(
  web_app::IsolatedWebAppThrottle::MaybeCreateAndAdd(registry);

#endif  // !BUILDFLAG(IS_ANDROID)

  actor::ActorNavigationThrottle::MaybeCreateAndAdd(registry);

  dom_distiller::DistillerPageWebContents::MaybeCreateAndAddNavigationThrottle(
      registry);

  dom_distiller::DistillerReferrerThrottle::MaybeCreateAndAdd(registry);

#if BUILDFLAG(ENABLE_GLIC)
  glic::GlicNavigationThrottle::MaybeCreateAndAdd(registry);
#endif  // BUILDFLAG(ENABLE_GLIC)
}
+2 −0
Original line number Diff line number Diff line
@@ -385,6 +385,8 @@ public abstract class ChromeFeatureList {
    public static final String CONTROLS_VISIBILITY_FROM_NAVIGATIONS =
            "ControlsVisibilityFromNavigations";
    public static final String CORMORANT = "Cormorant";
    public static final String CROSS_DEVICE_PREF_TRACKER_EXTRA_LOGS =
            "CrossDevicePrefTrackerExtraLogs";
    public static final String CROSS_DEVICE_TAB_PANE_ANDROID = "CrossDeviceTabPaneAndroid";
    public static final String DARKEN_WEBSITES_CHECKBOX_IN_THEMES_SETTING =
            "DarkenWebsitesCheckboxInThemesSetting";
+16 −4
Original line number Diff line number Diff line
@@ -7652,9 +7652,6 @@
            "experiments": [
                {
                    "name": "Enabled",
                    "params": {
                        "ContextualTasksEntryPoint": "toolbar-revisit"
                    },
                    "enable_features": [
                        "ContextualTasks",
                        "HappinessTrackingSurveysForDesktopNextPanel"
@@ -12241,7 +12238,7 @@
                {
                    "name": "Enabled",
                    "enable_features": [
                        "GlicActorUiOverlayMagicCursor"
                        "GlicActorUiMagicCursor"
                    ]
                }
            ]
@@ -27746,6 +27743,21 @@
            ]
        }
    ],
    "UseSceneViewController": [
        {
            "platforms": [
                "ios"
            ],
            "experiments": [
                {
                    "name": "Enabled",
                    "enable_features": [
                        "UseSceneViewController"
                    ]
                }
            ]
        }
    ],
    "UseSmartRefForGPUFenceHandle": [
        {
            "platforms": [
Loading