Commit b326edea authored by Sebastien Lalancette's avatar Sebastien Lalancette Committed by Chromium LUCI CQ

[iOS] Clean-up NativeContextMenu Feature Flag

Bug: 1110944
Change-Id: Ie0c4809718959ca06a1eff8bc7d309644d1d98c2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2617580
Commit-Queue: Sebastien Lalancette <seblalancette@chromium.org>
Auto-Submit: Sebastien Lalancette <seblalancette@chromium.org>
Reviewed-by: default avatarGauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842129}
parent f49f7768
...@@ -1915,11 +1915,6 @@ ...@@ -1915,11 +1915,6 @@
"owners": [ "dschuff", "native-client-dev@googlegroups.com" ], "owners": [ "dschuff", "native-client-dev@googlegroups.com" ],
"expiry_milestone": 100 "expiry_milestone": 100
}, },
{
"name": "enable-native-context-menus",
"owners": [ "seblalancette" ],
"expiry_milestone": 89
},
{ {
"name": "enable-native-notifications", "name": "enable-native-notifications",
"owners": [ "peter", "finnur", "knollr" ], "owners": [ "peter", "finnur", "knollr" ],
......
...@@ -485,10 +485,6 @@ const flags_ui::FeatureEntry kFeatureEntries[] = { ...@@ -485,10 +485,6 @@ const flags_ui::FeatureEntry kFeatureEntries[] = {
{"illustrated-empty-states", flag_descriptions::kIllustratedEmptyStatesName, {"illustrated-empty-states", flag_descriptions::kIllustratedEmptyStatesName,
flag_descriptions::kIllustratedEmptyStatesDescription, flags_ui::kOsIos, flag_descriptions::kIllustratedEmptyStatesDescription, flags_ui::kOsIos,
FEATURE_VALUE_TYPE(kIllustratedEmptyStates)}, FEATURE_VALUE_TYPE(kIllustratedEmptyStates)},
{"enable-native-context-menus",
flag_descriptions::kEnableNativeContextMenusName,
flag_descriptions::kEnableNativeContextMenusDescription, flags_ui::kOsIos,
FEATURE_VALUE_TYPE(kEnableNativeContextMenus)},
{"expanded-tab-strip", flag_descriptions::kExpandedTabStripName, {"expanded-tab-strip", flag_descriptions::kExpandedTabStripName,
flag_descriptions::kExpandedTabStripDescription, flags_ui::kOsIos, flag_descriptions::kExpandedTabStripDescription, flags_ui::kOsIos,
FEATURE_VALUE_TYPE(kExpandedTabStrip)}, FEATURE_VALUE_TYPE(kExpandedTabStrip)},
......
...@@ -194,12 +194,6 @@ const char kEnableIOSManagedSettingsUIDescription[] = ...@@ -194,12 +194,6 @@ const char kEnableIOSManagedSettingsUIDescription[] =
"Enable showing a different UI when the setting is managed by an " "Enable showing a different UI when the setting is managed by an "
"enterprise policy on iOS."; "enterprise policy on iOS.";
const char kEnableNativeContextMenusName[] =
"Enable Context Menus in Native UI";
const char kEnableNativeContextMenusDescription[] =
"Enables the new iOS 13 context menus on various pieces of UI in native "
"Chrome (e.g. History, Bookmarks).";
const char kExpandedTabStripName[] = "Enable expanded tabstrip"; const char kExpandedTabStripName[] = "Enable expanded tabstrip";
const char kExpandedTabStripDescription[] = const char kExpandedTabStripDescription[] =
"Enables the new expanded tabstrip. Activated by swiping down the tabstrip" "Enables the new expanded tabstrip. Activated by swiping down the tabstrip"
......
...@@ -169,10 +169,6 @@ extern const char kEnableIncognitoModeAvailabilityIOSDescription[]; ...@@ -169,10 +169,6 @@ extern const char kEnableIncognitoModeAvailabilityIOSDescription[];
extern const char kEnableIOSManagedSettingsUIName[]; extern const char kEnableIOSManagedSettingsUIName[];
extern const char kEnableIOSManagedSettingsUIDescription[]; extern const char kEnableIOSManagedSettingsUIDescription[];
// Title and description for the flag to enable new context menus for native UI.
extern const char kEnableNativeContextMenusName[];
extern const char kEnableNativeContextMenusDescription[];
// Title and description for the flag to enable an expanded tab strip. // Title and description for the flag to enable an expanded tab strip.
extern const char kExpandedTabStripName[]; extern const char kExpandedTabStripName[];
extern const char kExpandedTabStripDescription[]; extern const char kExpandedTabStripDescription[];
......
...@@ -28,9 +28,6 @@ const base::Feature kForceUnstackedTabstrip{"ForceUnstackedTabstrip", ...@@ -28,9 +28,6 @@ const base::Feature kForceUnstackedTabstrip{"ForceUnstackedTabstrip",
const base::Feature kTestFeature{"TestFeature", const base::Feature kTestFeature{"TestFeature",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kEnableNativeContextMenus{"EnableNativeContextMenus",
base::FEATURE_ENABLED_BY_DEFAULT};
const base::Feature kEnableIOSManagedSettingsUI{ const base::Feature kEnableIOSManagedSettingsUI{
"EnableIOSManagedSettingsUI", base::FEATURE_ENABLED_BY_DEFAULT}; "EnableIOSManagedSettingsUI", base::FEATURE_ENABLED_BY_DEFAULT};
......
...@@ -31,9 +31,6 @@ extern const base::Feature kForceUnstackedTabstrip; ...@@ -31,9 +31,6 @@ extern const base::Feature kForceUnstackedTabstrip;
// features in tests works. // features in tests works.
extern const base::Feature kTestFeature; extern const base::Feature kTestFeature;
// Feature flag that enables the native UI Context Menus (not for Web content).
extern const base::Feature kEnableNativeContextMenus;
// Feature flag to enable showing a different UI when the setting is managed by // Feature flag to enable showing a different UI when the setting is managed by
// an enterprise policy. // an enterprise policy.
extern const base::Feature kEnableIOSManagedSettingsUI; extern const base::Feature kEnableIOSManagedSettingsUI;
......
...@@ -12,6 +12,5 @@ ...@@ -12,6 +12,5 @@
#endif #endif
bool IsNativeContextMenuEnabled() { bool IsNativeContextMenuEnabled() {
return base::ios::IsRunningOnIOS13OrLater() && return base::ios::IsRunningOnIOS13OrLater();
base::FeatureList::IsEnabled(kEnableNativeContextMenus);
} }
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