diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/components/arc/arc_features.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/arc/arc_features.cc')
| -rw-r--r-- | chromium/components/arc/arc_features.cc | 7 |
1 files changed, 6 insertions, 1 deletions
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 |