Commit 05ec582a authored by Anqing Zhao's avatar Anqing Zhao Committed by Commit Bot

Add feature flag 'EnterpriseReportingInChromeOS'

Similar to the existing flag 'EnterpriseReportingInBrowser', the new
feature flag is used for similar functionality, uploading usage data from
Chrome OS to DM server.

Bug: 1010213
Change-Id: I53b2e20535fccd2dd357cde42660832f6359df61
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1926489Reviewed-by: default avatarOwen Min <zmin@chromium.org>
Reviewed-by: default avatarSergey Poromov <poromov@chromium.org>
Commit-Queue: Anqing Zhao <anqing@google.com>
Cr-Commit-Position: refs/heads/master@{#717649}
parent 551bd223
......@@ -4257,6 +4257,13 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kEnterpriseReportingInBrowser)},
#endif // !defined(OS_ANDROID)
#if defined(OS_CHROMEOS)
{"enterprise-reporting-in-chromeos",
flag_descriptions::kEnterpriseReportingInChromeOSName,
flag_descriptions::kEnterpriseReportingInChromeOSDescription, kOsCrOS,
FEATURE_VALUE_TYPE(features::kEnterpriseReportingInChromeOS)},
#endif // !defined(OS_CHROMEOS)
{"enable-autofill-do-not-migrate-unsupported-local-cards",
flag_descriptions::kEnableAutofillDoNotMigrateUnsupportedLocalCardsName,
flag_descriptions::
......
......@@ -2172,6 +2172,11 @@
"owners": [ "pastarmovj", "zmin" ],
"expiry_milestone": 81
},
{
"name": "enterprise-reporting-in-chromeos",
"owners": [ "anqing" ],
"expiry_milestone": 83
},
{
"name": "ev-details-in-page-info",
"owners": [ "cthomp" ],
......
......@@ -2960,7 +2960,7 @@ const char kEnterpriseReportingInBrowserName[] =
"Enterprise cloud reporting in browser";
const char kEnterpriseReportingInBrowserDescription[] =
"Enable the enterprise cloud reporting in browser without installing the "
"reporting companion extension. This feautre requires device level cloud "
"reporting companion extension. This feature requires device level cloud "
"mangement.";
const char kHappinessTrackingSurveysForDesktopName[] =
......@@ -3573,6 +3573,12 @@ const char kEnableZeroStateSuggestionsDescription[] =
"Enable Zero State Suggestions feature in Launcher, which will show "
"suggestions when launcher search box is active with an empty query";
const char kEnterpriseReportingInChromeOSName[] =
"Enterprise cloud reporting in Chrome OS";
const char kEnterpriseReportingInChromeOSDescription[] =
"Enable the enterprise cloud reporting in Chrome OS. This feature requires "
"user level cloud management.";
const char kExoPointerLockName[] = "Pointer lock for Linux applications";
const char kExoPointerLockDescription[] =
"Allow Linux applications to request a pointer lock, i.e. exclusive use of "
......
......@@ -2123,6 +2123,9 @@ extern const char kTrimOnMemoryPressureDescription[];
extern const char kEnableZeroStateSuggestionsName[];
extern const char kEnableZeroStateSuggestionsDescription[];
extern const char kEnterpriseReportingInChromeOSName[];
extern const char kEnterpriseReportingInChromeOSDescription[];
extern const char kExoPointerLockName[];
extern const char kExoPointerLockDescription[];
......
......@@ -351,6 +351,12 @@ const base::Feature kEnterpriseReportingInBrowser{
"EnterpriseReportingInBrowser", base::FEATURE_DISABLED_BY_DEFAULT};
#endif
#if defined(OS_CHROMEOS)
// Upload enterprise cloud reporting from Chrome OS.
const base::Feature kEnterpriseReportingInChromeOS{
"EnterpriseReportingInChromeOS", base::FEATURE_DISABLED_BY_DEFAULT};
#endif
#if defined(OS_CHROMEOS)
// Enables event-based status reporting for child accounts in Chrome OS.
const base::Feature kEventBasedStatusReporting{
......
......@@ -199,6 +199,11 @@ COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kEnterpriseReportingInBrowser;
#endif
#if defined(OS_CHROMEOS)
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kEnterpriseReportingInChromeOS;
#endif
#if defined(OS_CHROMEOS)
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kEventBasedStatusReporting;
......
......@@ -37393,6 +37393,7 @@ from previous Chrome versions.
<int value="-2953333" label="AndroidHistoryManager:disabled"/>
<int value="-2512468" label="OmniboxMaterialDesignWeatherIcons:disabled"/>
<int value="-2371418" label="disable-display-list-2d-canvas"/>
<int value="-1164379" label="EnterpriseReportingInChromeOS:disabled"/>
<int value="0" label="BAD_FLAG_FORMAT">
Command-line flag doesn't start with two dashes.
</int>
......@@ -38095,6 +38096,7 @@ from previous Chrome versions.
<int value="946688335" label="OmniboxSpareRenderer:disabled"/>
<int value="952558794" label="enable-remote-assistance"/>
<int value="955340765" label="ChromeHomeOptOutSnackbar:enabled"/>
<int value="955425932" label="EnterpriseReportingInChromeOS:enabled"/>
<int value="963457392" label="ChromeHomeModernLayout:disabled"/>
<int value="963671232" label="DrawOcclusion:disabled"/>
<int value="964613807" label="ContextualSearchTranslationModel:disabled"/>
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