Revert "Clean up UpdateHistoryEntryPointsInIncognito flags in iOS."

This reverts commit f7ab44b. Reason for revert: We still need the flag Original change's description: > Clean up UpdateHistoryEntryPointsInIncognito flags in iOS. > > This CL cleans up the old UpdateHistoryEntryPointsInIncognito feature > flag in iOS. > > Bug: 1308395 > Change-Id: I0b255d843b8eee938682e7a477762a2d21f5a160 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3568569 > Reviewed-by: Gauthier Ambard <gambard@chromium.org> > Commit-Queue: Side YILMAZ <sideyilmaz@chromium.org> > Cr-Commit-Position: refs/heads/main@{#988925} Bug: 1308395 Change-Id: I9a75bfe633b51bafdeac3d4f4f1aa9e3e8770a79 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3578738 Reviewed-by: Gauthier Ambard <gambard@chromium.org> Commit-Queue: Side YILMAZ <sideyilmaz@chromium.org> Cr-Commit-Position: refs/heads/main@{#990950}
Denger-Network · Apr 11, 2022 · 4b40a30 · 4b40a30
1 parent 1d74835
commit 4b40a30
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 3 deletions.
diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/about_flags.mm
@@ -630,6 +630,11 @@
     {"incognito-ntp-revamp", flag_descriptions::kIncognitoNtpRevampName,
      flag_descriptions::kIncognitoNtpRevampDescription, flags_ui::kOsIos,
      FEATURE_VALUE_TYPE(kIncognitoNtpRevamp)},
+    {"update-history-entry-points-in-incognito",
+     flag_descriptions::kUpdateHistoryEntryPointsInIncognitoName,
+     flag_descriptions::kUpdateHistoryEntryPointsInIncognitoDescription,
+     flags_ui::kOsIos,
+     FEATURE_VALUE_TYPE(kUpdateHistoryEntryPointsInIncognito)},
     {"sync-trusted-vault-passphrase-ios-rpc",
      flag_descriptions::kSyncTrustedVaultPassphraseiOSRPCName,
      flag_descriptions::kSyncTrustedVaultPassphraseiOSRPCDescription,

diff --git a/ios/chrome/browser/flags/ios_chrome_flag_descriptions.cc b/ios/chrome/browser/flags/ios_chrome_flag_descriptions.cc
@@ -529,6 +529,12 @@ const char kToolbarContainerDescription[] =
     "When enabled, the toolbars and their fullscreen animations will be "
     "managed by the toolbar container coordinator rather than BVC.";
 
+const char kUpdateHistoryEntryPointsInIncognitoName[] =
+    "Update history entry points in Incognito.";
+const char kUpdateHistoryEntryPointsInIncognitoDescription[] =
+    "When enabled, the entry points to history UI from Incognito mode will be "
+    "removed.";
+
 const char kUseLensToSearchForImageName[] =
     "Use Google Lens to Search for images";
 const char kUseLensToSearchForImageDescription[] =

diff --git a/ios/chrome/browser/flags/ios_chrome_flag_descriptions.h b/ios/chrome/browser/flags/ios_chrome_flag_descriptions.h
@@ -476,6 +476,11 @@ extern const char kTabsSearchRegularResultsSuggestedActionsDescription[];
 extern const char kToolbarContainerName[];
 extern const char kToolbarContainerDescription[];
 
+// Title and description for the flag to enable removing any entry points to the
+// history UI from Incognito mode.
+extern const char kUpdateHistoryEntryPointsInIncognitoName[];
+extern const char kUpdateHistoryEntryPointsInIncognitoDescription[];
+
 // Title and description for the flag to enable using Lens to search for an
 // image from the long press context menu.
 extern const char kUseLensToSearchForImageName[];

diff --git a/ios/chrome/browser/ui/popup_menu/popup_menu_mediator.mm b/ios/chrome/browser/ui/popup_menu/popup_menu_mediator.mm
@@ -1148,7 +1148,8 @@ - (void)createToolsMenuItems {
       CreateTableViewItem(IDS_IOS_TOOLS_MENU_SETTINGS, PopupMenuActionSettings,
                           @"popup_menu_settings", kToolsMenuSettingsId);
 
-  if (self.isIncognito) {
+  if (self.isIncognito &&
+      base::FeatureList::IsEnabled(kUpdateHistoryEntryPointsInIncognito)) {
     return @[ bookmarks, self.readingListItem, downloadsFolder, settings ];
   }
 
@@ -1191,7 +1192,8 @@ - (BOOL)isEditBookmarksEnabled {
 // item associated with |URL|.
 - (BOOL)shouldUseIncognitoNTPResourcesForURL:(const GURL&)URL {
   return URL.DeprecatedGetOriginAsURL() == kChromeUINewTabURL &&
-         self.isIncognito;
+         self.isIncognito &&
+         base::FeatureList::IsEnabled(kUpdateHistoryEntryPointsInIncognito);
 }
 
 @end
diff --git a/ios/chrome/browser/ui/toolbar/toolbar_mediator.mm b/ios/chrome/browser/ui/toolbar/toolbar_mediator.mm
@@ -367,7 +367,8 @@ - (UIMenu*)menuForNavigationItems:
 // item associated with |URL|.
 - (BOOL)shouldUseIncognitoNTPResourcesForURL:(const GURL&)URL {
   return URL.DeprecatedGetOriginAsURL() == kChromeUINewTabURL &&
-         self.isIncognito;
+         self.isIncognito &&
+         base::FeatureList::IsEnabled(kUpdateHistoryEntryPointsInIncognito);
 }
 
 // Returns the menu for the new tab button.

diff --git a/ios/chrome/browser/ui/ui_feature_flags.cc b/ios/chrome/browser/ui/ui_feature_flags.cc
@@ -51,6 +51,9 @@ const base::Feature kIOSLocationBarUseNativeContextMenu{
 const base::Feature kSearchHistoryLinkIOS{"SearchHistoryLinkIOS",
                                           base::FEATURE_ENABLED_BY_DEFAULT};
 
+const base::Feature kUpdateHistoryEntryPointsInIncognito{
+    "UpdateHistoryEntryPointsInIncognito", base::FEATURE_DISABLED_BY_DEFAULT};
+
 const base::Feature kUseLensToSearchForImage{"UseLensToSearchForImage",
                                              base::FEATURE_DISABLED_BY_DEFAULT};
 

diff --git a/ios/chrome/browser/ui/ui_feature_flags.h b/ios/chrome/browser/ui/ui_feature_flags.h
@@ -64,6 +64,10 @@ extern const char kIOSOmniboxUpdatedPopupUIVariation2[];
 // Enables the Search History Link in Clear Browsing Data for iOS.
 extern const base::Feature kSearchHistoryLinkIOS;
 
+// Feature flag to enable removing any entry points to the history UI from
+// Incognito mode.
+extern const base::Feature kUpdateHistoryEntryPointsInIncognito;
+
 // Feature flag to enable using Lens to search for images.
 extern const base::Feature kUseLensToSearchForImage;