Add CrostiniBackup feature flag
Bug: 912638
Change-Id: I46b374d4753b2cc4414b3b4117ce83a3991834d4
Reviewed-on: https://chromium-review.googlesource.com/c/1401826
Reviewed-by: Nicholas Verne <nverne@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Joel Hockey <joelhockey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#621405}diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 3979bd86..139c246 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1999,6 +1999,9 @@
SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableNewZIPUnpacker)},
#endif // OS_CHROMEOS
#if defined(OS_CHROMEOS)
+ {"crostini-backup", flag_descriptions::kCrostiniBackupName,
+ flag_descriptions::kCrostiniBackupDescription, kOsCrOS,
+ FEATURE_VALUE_TYPE(chromeos::features::kCrostiniBackup)},
{"crostini-files", flag_descriptions::kCrostiniFilesName,
flag_descriptions::kCrostiniFilesDescription, kOsCrOS,
FEATURE_VALUE_TYPE(chromeos::features::kCrostiniFiles)},
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
index cf6c778..2fc2cba5c 100644
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -457,6 +457,11 @@
"expiry_milestone": 76
},
{
+ "name": "crostini-backup",
+ "owners": [ "joelhockey", "nverne", "benwells" ],
+ "expiry_milestone": 77
+ },
+ {
"name": "crostini-files",
"owners": [ "joelhockey", "nverne", "benwells" ],
"expiry_milestone": 76
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index 5715af1c..bcf5e903 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -3118,6 +3118,9 @@
const char kCrosRegionsModeOverride[] = "Override VPD values.";
const char kCrosRegionsModeHide[] = "Hide VPD values.";
+const char kCrostiniBackupName[] = "Crostini Backup";
+const char kCrostiniBackupDescription[] = "Enable Crostini export and import.";
+
const char kCrostiniFilesName[] = "Crostini Files";
const char kCrostiniFilesDescription[] =
"Enable Crostini file sharing in Files app.";
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index ad54969..ba1f7a1 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1873,6 +1873,9 @@
extern const char kCrosRegionsModeOverride[];
extern const char kCrosRegionsModeHide[];
+extern const char kCrostiniBackupName[];
+extern const char kCrostiniBackupDescription[];
+
extern const char kCrostiniFilesName[];
extern const char kCrostiniFilesDescription[];
diff --git a/chromeos/constants/chromeos_features.cc b/chromeos/constants/chromeos_features.cc
index 462a903..a30fa5eb 100644
--- a/chromeos/constants/chromeos_features.cc
+++ b/chromeos/constants/chromeos_features.cc
@@ -25,6 +25,10 @@
"AutoScreenBrightnessContinuedAdjustment",
base::FEATURE_DISABLED_BY_DEFAULT};
+// Enables or disables Crostini Backup.
+const base::Feature kCrostiniBackup{"CrostiniBackup",
+ base::FEATURE_DISABLED_BY_DEFAULT};
+
// Enables or disables Crostini Files.
const base::Feature kCrostiniFiles{"CrostiniFiles",
base::FEATURE_ENABLED_BY_DEFAULT};
diff --git a/chromeos/constants/chromeos_features.h b/chromeos/constants/chromeos_features.h
index 9a06375..4475df5 100644
--- a/chromeos/constants/chromeos_features.h
+++ b/chromeos/constants/chromeos_features.h
@@ -19,6 +19,7 @@
CHROMEOS_EXPORT extern const base::Feature kAutoScreenBrightness;
CHROMEOS_EXPORT extern const base::Feature
kAutoScreenBrightnessContinuedAdjustment;
+CHROMEOS_EXPORT extern const base::Feature kCrostiniBackup;
CHROMEOS_EXPORT extern const base::Feature kCrostiniFiles;
CHROMEOS_EXPORT extern const base::Feature kCrostiniUsbSupport;
CHROMEOS_EXPORT extern const base::Feature kCryptAuthV2Enrollment;
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
index 5507d7a..89580db 100644
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -31610,6 +31610,7 @@
<int value="401983950" label="enable-spdy4"/>
<int value="402143634" label="enable-search-button-in-omnibox-always"/>
<int value="403288255" label="enable-wheel-scroll-latching"/>
+ <int value="403741682" label="CrostiniBackup:enabled"/>
<int value="405329388"
label="FramebustingNeedsSameOriginOrUserGesture:enabled"/>
<int value="411250226" label="AutoplayMutedVideos:disabled"/>
@@ -32371,6 +32372,7 @@
<int value="1736698988" label="FsNosymfollow:disabled"/>
<int value="1739456903" label="PWAFullCodeCache:enabled"/>
<int value="1747279677" label="disable-delegated-renderer"/>
+ <int value="1750822869" label="CrostiniBackup:disabled"/>
<int value="1752168018" label="enable-stale-while-revalidate"/>
<int value="1755024316" label="HostWindowsInAppShimProcess:disabled"/>
<int value="1760946944" label="MacViewsAutofillPopup:disabled"/>
