diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json index ea39a930ca3430..2ec86d66882149 100644 --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json @@ -4736,6 +4736,11 @@ ], "expiry_milestone": 125 }, + { + "name": "idle-timeout-policies", + "owners": ["esalma@google.com", "cbe-magic@google.com"], + "expiry_milestone": 125 + }, { "name": "ignore-gpu-blocklist", "owners": [ "kbr@chromium.org", "zmo@chromium.org" ], diff --git a/ios/chrome/browser/flags/BUILD.gn b/ios/chrome/browser/flags/BUILD.gn index 1b5dccaa59ec87..35c174b9134612 100644 --- 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 index 6e8bae7893db53..503b408f849c13 100644 --- 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 index 5d5a8d318965c8..c0cfd8121a89e6 100644 --- 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 index a99a5c9067ac6d..1be297621bdecc 100644 --- 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[];