From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/components/arc/arc_features.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'chromium/components/arc/arc_features.cc') diff --git a/chromium/components/arc/arc_features.cc b/chromium/components/arc/arc_features.cc index 86fe498c989..8f9fb29823d 100644 --- a/chromium/components/arc/arc_features.cc +++ b/chromium/components/arc/arc_features.cc @@ -44,6 +44,11 @@ const base::Feature kEnableDocumentsProviderInFilesAppFeature{ const base::Feature kEnableRegularToChildTransitionFeature{ "ArcEnableRegularToChildTransition", base::FEATURE_ENABLED_BY_DEFAULT}; +// Controls whether secondary accounts are added to ARC++ for child user. +// This is added temporarily to allow further investigation. +const base::Feature kEnableSecondaryAccountsForChildExperiment{ + "ArcEnableSecondaryAccountForChild", base::FEATURE_DISABLED_BY_DEFAULT}; + // Controls whether we should delegate audio focus requests from ARC to Chrome. const base::Feature kEnableUnifiedAudioFocusFeature{ "ArcEnableUnifiedAudioFocus", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -56,7 +61,7 @@ const base::Feature kFilePickerExperimentFeature{ // Note, that we keep the original feature name to preserve // corresponding metrics. const base::Feature kNativeBridgeToggleFeature{ - "ArcNativeBridgeExperiment", base::FEATURE_ENABLED_BY_DEFAULT}; + "ArcNativeBridgeExperiment", base::FEATURE_DISABLED_BY_DEFAULT}; // Controls ARC picture-in-picture feature. If this is enabled, then Android // will control which apps can enter PIP. If this is disabled, then ARC PIP -- cgit v1.2.1