[IdleTimeout] Adding Feature Flag

Putting the IdleTimeout and IdleTimeout policies behind a flag. Bug: b/301676922 Change-Id: Ifab65ae67e1af2b04ec3f2be6df844821b69ee62 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5192409 Commit-Queue: Salma Elmahallawy <[email protected]> Reviewed-by: Fabio Tirelo <[email protected]> Cr-Commit-Position: refs/heads/main@{#1247270}
anhtai9710 · Jan 15, 2024 · e8a5df1 · e8a5df1
1 parent b59b95d
commit e8a5df1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 0 deletions.
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
@@ -4736,6 +4736,11 @@
     ],
     "expiry_milestone": 125
   },
+  {
+    "name": "idle-timeout-policies",
+    "owners": ["[email protected]", "[email protected]"],
+    "expiry_milestone": 125
+  },
   {
     "name": "ignore-gpu-blocklist",
     "owners": [ "[email protected]", "[email protected]" ],

diff --git a/ios/chrome/browser/flags/BUILD.gn b/ios/chrome/browser/flags/BUILD.gn
@@ -23,6 +23,7 @@ source_set("flags") {
     "//components/dom_distiller/core",
     "//components/download/public/background_service:public",
     "//components/enterprise",
+    "//components/enterprise/idle",
     "//components/feature_engagement/public",
     "//components/feed:feature_list",
     "//components/flags_ui",

diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/about_flags.mm
@@ -32,6 +32,7 @@
 #import "components/dom_distiller/core/dom_distiller_switches.h"
 #import "components/download/public/background_service/features.h"
 #import "components/enterprise/browser/enterprise_switches.h"
+#import "components/enterprise/idle/idle_features.h"
 #import "components/feature_engagement/public/feature_constants.h"
 #import "components/feature_engagement/public/feature_list.h"
 #import "components/feed/feed_feature_list.h"
@@ -1555,6 +1556,9 @@
      flag_descriptions::kTabGridCompositionalLayoutName,
      flag_descriptions::kTabGridCompositionalLayoutDescription,
      flags_ui::kOsIos, FEATURE_VALUE_TYPE(kTabGridCompositionalLayout)},
+    {"idle-timeout-policies", flag_descriptions::kIdleTimeoutPoliciesName,
+     flag_descriptions::kIdleTimeoutPoliciesDescription, flags_ui::kOsIos,
+     FEATURE_VALUE_TYPE(enterprise_idle::kIdleTimeout)},
     {"bottom-omnibox-promo-fre", flag_descriptions::kBottomOmniboxPromoFREName,
      flag_descriptions::kBottomOmniboxPromoFREDescription, flags_ui::kOsIos,
      FEATURE_WITH_PARAMS_VALUE_TYPE(kBottomOmniboxPromoFRE,

diff --git a/ios/chrome/browser/flags/ios_chrome_flag_descriptions.cc b/ios/chrome/browser/flags/ios_chrome_flag_descriptions.cc
@@ -802,6 +802,11 @@ const char kPromosManagerUsesFETDescription[] =
     "Migrates the Promos Manager to use the Feature Engagement Tracker as its "
     "impression tracking system";
 
+const char kIdleTimeoutPoliciesName[] =
+    "IdleTimeout and IdleTimeoutActions Policies";
+const char kIdleTimeoutPoliciesDescription[] =
+    "Enable IdleTimeout and IdleTimeoutActions enterprise policies.";
+
 const char kIPHPriceNotificationsWhileBrowsingName[] =
     "Price Tracking IPH Display";
 const char kIPHPriceNotificationsWhileBrowsingDescription[] =

diff --git a/ios/chrome/browser/flags/ios_chrome_flag_descriptions.h b/ios/chrome/browser/flags/ios_chrome_flag_descriptions.h
@@ -381,6 +381,11 @@ extern const char kFullScreenPromoOnOmniboxCopyPasteDescription[];
 extern const char kFullscreenPromosManagerSkipInternalLimitsName[];
 extern const char kFullscreenPromosManagerSkipInternalLimitsDescription[];
 
+// Title and description for the flag to enable IdleTimeout and
+// IdleTimeoutActions policies.
+extern const char kIdleTimeoutPoliciesName[];
+extern const char kIdleTimeoutPoliciesDescription[];
+
 // Title and description for the command line switch used to determine the
 // active fullscreen viewport adjustment mode.
 extern const char kFullscreenSmoothScrollingName[];