Commit 6f2e8141 authored by Max Li's avatar Max Li Committed by Commit Bot

Add flag for fetching device activity statuses

Bug: 923594
Change-Id: I44f33f94538bcb7a52a889377523bb9048e4d266
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1874591
Commit-Queue: Max Li <themaxli@chromium.org>
Reviewed-by: default avatarJosh Nohle <nohle@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708600}
parent 7293c0ad
...@@ -1708,6 +1708,10 @@ const FeatureEntry kFeatureEntries[] = { ...@@ -1708,6 +1708,10 @@ const FeatureEntry kFeatureEntries[] = {
kOsCrOS, kOsCrOS,
FEATURE_VALUE_TYPE( FEATURE_VALUE_TYPE(
chromeos::features::kBluetoothAggressiveAppearanceFilter)}, chromeos::features::kBluetoothAggressiveAppearanceFilter)},
{"cryptauth-v2-device-activity-status",
flag_descriptions::kCryptAuthV2DeviceActivityStatusName,
flag_descriptions::kCryptAuthV2DeviceActivityStatusDescription, kOsCrOS,
FEATURE_VALUE_TYPE(chromeos::features::kCryptAuthV2DeviceActivityStatus)},
{"cryptauth-v2-devicesync", flag_descriptions::kCryptAuthV2DeviceSyncName, {"cryptauth-v2-devicesync", flag_descriptions::kCryptAuthV2DeviceSyncName,
flag_descriptions::kCryptAuthV2DeviceSyncDescription, kOsCrOS, flag_descriptions::kCryptAuthV2DeviceSyncDescription, kOsCrOS,
FEATURE_VALUE_TYPE(chromeos::features::kCryptAuthV2DeviceSync)}, FEATURE_VALUE_TYPE(chromeos::features::kCryptAuthV2DeviceSync)},
......
...@@ -575,6 +575,11 @@ ...@@ -575,6 +575,11 @@
"owners": [ "lxj", "timloh", "benwells" ], "owners": [ "lxj", "timloh", "benwells" ],
"expiry_milestone": 82 "expiry_milestone": 82
}, },
{
"name": "cryptauth-v2-device-activity-status",
"owners": [ "khorimoto", "nohle", "themaxli" ],
"expiry_milestone": 85
},
{ {
"name": "cryptauth-v2-devicesync", "name": "cryptauth-v2-devicesync",
"owners": [ "khorimoto", "nohle" ], "owners": [ "khorimoto", "nohle" ],
......
...@@ -3298,6 +3298,11 @@ const char kCrostiniWebUIInstallerName[] = "Crostini WebUI Installer"; ...@@ -3298,6 +3298,11 @@ const char kCrostiniWebUIInstallerName[] = "Crostini WebUI Installer";
const char kCrostiniWebUIInstallerDescription[] = const char kCrostiniWebUIInstallerDescription[] =
"Enable the new WebUI Crostini Installer."; "Enable the new WebUI Crostini Installer.";
const char kCryptAuthV2DeviceActivityStatusName[] =
"CryptAuth Device Activity Status";
const char kCryptAuthV2DeviceActivityStatusDescription[] =
"Use the CryptAuth GetDevicesActivityStatus API to sort devices.";
const char kCryptAuthV2DeviceSyncName[] = "CryptAuth v2 DeviceSync"; const char kCryptAuthV2DeviceSyncName[] = "CryptAuth v2 DeviceSync";
const char kCryptAuthV2DeviceSyncDescription[] = const char kCryptAuthV2DeviceSyncDescription[] =
"Use the CryptAuth v2 DeviceSync protocol."; "Use the CryptAuth v2 DeviceSync protocol.";
......
...@@ -1956,6 +1956,9 @@ extern const char kCrostiniUsbAllowUnsupportedDescription[]; ...@@ -1956,6 +1956,9 @@ extern const char kCrostiniUsbAllowUnsupportedDescription[];
extern const char kCrostiniWebUIInstallerName[]; extern const char kCrostiniWebUIInstallerName[];
extern const char kCrostiniWebUIInstallerDescription[]; extern const char kCrostiniWebUIInstallerDescription[];
extern const char kCryptAuthV2DeviceActivityStatusName[];
extern const char kCryptAuthV2DeviceActivityStatusDescription[];
extern const char kCryptAuthV2DeviceSyncName[]; extern const char kCryptAuthV2DeviceSyncName[];
extern const char kCryptAuthV2DeviceSyncDescription[]; extern const char kCryptAuthV2DeviceSyncDescription[];
......
...@@ -63,6 +63,10 @@ const base::Feature kCrostiniUsbAllowUnsupported{ ...@@ -63,6 +63,10 @@ const base::Feature kCrostiniUsbAllowUnsupported{
const base::Feature kCrostiniWebUIInstaller{"CrostiniWebUIInstaller", const base::Feature kCrostiniWebUIInstaller{"CrostiniWebUIInstaller",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
// Enables or disables using Cryptauth's GetDevicesActivityStatus API.
const base::Feature kCryptAuthV2DeviceActivityStatus{
"CryptAuthV2DeviceActivityStatus", base::FEATURE_DISABLED_BY_DEFAULT};
// Enables or disables the CryptAuth v2 DeviceSync flow. // Enables or disables the CryptAuth v2 DeviceSync flow.
const base::Feature kCryptAuthV2DeviceSync{"CryptAuthV2DeviceSync", const base::Feature kCryptAuthV2DeviceSync{"CryptAuthV2DeviceSync",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
......
...@@ -39,6 +39,8 @@ extern const base::Feature kCrostiniUsbAllowUnsupported; ...@@ -39,6 +39,8 @@ extern const base::Feature kCrostiniUsbAllowUnsupported;
COMPONENT_EXPORT(CHROMEOS_CONSTANTS) COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
extern const base::Feature kCrostiniWebUIInstaller; extern const base::Feature kCrostiniWebUIInstaller;
COMPONENT_EXPORT(CHROMEOS_CONSTANTS) COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
extern const base::Feature kCryptAuthV2DeviceActivityStatus;
COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
extern const base::Feature kCryptAuthV2DeviceSync; extern const base::Feature kCryptAuthV2DeviceSync;
COMPONENT_EXPORT(CHROMEOS_CONSTANTS) COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
extern const base::Feature kCryptAuthV2Enrollment; extern const base::Feature kCryptAuthV2Enrollment;
......
...@@ -37337,6 +37337,7 @@ from previous Chrome versions. ...@@ -37337,6 +37337,7 @@ from previous Chrome versions.
<int value="584541349" label="ContextualSearchSingleActions:disabled"/> <int value="584541349" label="ContextualSearchSingleActions:disabled"/>
<int value="586021329" label="VibrateRequiresUserGesture:enabled"/> <int value="586021329" label="VibrateRequiresUserGesture:enabled"/>
<int value="588333474" label="OfflineIndicator:disabled"/> <int value="588333474" label="OfflineIndicator:disabled"/>
<int value="589924262" label="CryptAuthV2DeviceActivityStatus:enabled"/>
<int value="592050831" label="disable-slimming-paint"/> <int value="592050831" label="disable-slimming-paint"/>
<int value="593707592" label="disable-network-portal-notification"/> <int value="593707592" label="disable-network-portal-notification"/>
<int value="594756372" label="MyFilesVolume:disabled"/> <int value="594756372" label="MyFilesVolume:disabled"/>
...@@ -38519,6 +38520,7 @@ from previous Chrome versions. ...@@ -38519,6 +38520,7 @@ from previous Chrome versions.
<int value="2129184006" label="NTPOfflinePageDownloadSuggestions:enabled"/> <int value="2129184006" label="NTPOfflinePageDownloadSuggestions:enabled"/>
<int value="2129929643" label="enable-use-zoom-for-dsf"/> <int value="2129929643" label="enable-use-zoom-for-dsf"/>
<int value="2132595171" label="OmniboxSearchEngineLogo:enabled"/> <int value="2132595171" label="OmniboxSearchEngineLogo:enabled"/>
<int value="2133594095" label="CryptAuthV2DeviceActivityStatus:disabled"/>
<int value="2134480727" label="MediaSessionAccelerators:disabled"/> <int value="2134480727" label="MediaSessionAccelerators:disabled"/>
<int value="2135408204" label="OverscrollHistoryNavigation:disabled"/> <int value="2135408204" label="OverscrollHistoryNavigation:disabled"/>
<int value="2137113620" <int value="2137113620"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment