Add the full restore flag.
The 'FullRestore' flag is added in ash considering the window manamement
might use it as well, and if it is added in the chrome/browser directory
then the window manamement in ash can't include the file in the
chrome/browser directory.
BUG=1146900
Change-Id: Ib61186739832048e52ce4c87dd9e40b996cddc8a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2525461
Commit-Queue: Nancy Wang <[email protected]>
Reviewed-by: Xiyuan Xia <[email protected]>
Cr-Commit-Position: refs/heads/master@{#825591}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index ee8ccad..4667ba5 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -5124,6 +5124,10 @@
flag_descriptions::kAppServiceIntentHandlingDescription, kOsCrOS,
FEATURE_VALUE_TYPE(features::kAppServiceIntentHandling)},
+ {"full-restore", flag_descriptions::kFullRestoreName,
+ flag_descriptions::kFullRestoreDescription, kOsCrOS,
+ FEATURE_VALUE_TYPE(ash::features::kFullRestore)},
+
{"use-fake-device-for-media-stream",
flag_descriptions::kUseFakeDeviceForMediaStreamName,
flag_descriptions::kUseFakeDeviceForMediaStreamDescription, kOsCrOS,
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
index 6fce932..255f7eb 100644
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -2718,6 +2718,11 @@
"expiry_milestone": 89
},
{
+ "name": "full-restore",
+ "owners": [ "dominickn", "nancylingwang", "sammiequon", "xdai" ],
+ "expiry_milestone": 95
+ },
+ {
"name": "fullscreen-controller-browser-scoped",
"owners": [ "thegreenfrog", "[email protected]" ],
"expiry_milestone": 87
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index d4ced3d..1992659 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -4145,6 +4145,9 @@
" option, so the chromuimos LSM denies symlink traversal on the"
" filesystem.";
+const char kFullRestoreName[] = "Full restore";
+const char kFullRestoreDescription[] = "Chrome OS full restore";
+
const char kHelpAppSearchServiceIntegrationName[] =
"Help App search service integration";
const char kHelpAppSearchServiceIntegrationDescription[] =
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index 3232a71..bd87c58 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -2422,6 +2422,9 @@
extern const char kFsNosymfollowName[];
extern const char kFsNosymfollowDescription[];
+extern const char kFullRestoreName[];
+extern const char kFullRestoreDescription[];
+
extern const char kHelpAppSearchServiceIntegrationName[];
extern const char kHelpAppSearchServiceIntegrationDescription[];
