Commit 3ea79072 authored by Huanzhong Huang's avatar Huanzhong Huang Committed by Commit Bot

[iOS] Exclusive use of CBD table view

Changes the code so that when the new-clear-browsing-data-ui flag is on,
the path through Settings that used to present a CBD CollectionView will
instead present a CBD TableView.

Change-Id: I75f6742099fc62a6c6553cbefef65cb351de87df
Bug: 935350
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1554497Reviewed-by: default avatarGauthier Ambard <gambard@chromium.org>
Commit-Queue: Huanzhong Huang <huanzhong@chromium.org>
Cr-Commit-Position: refs/heads/master@{#648662}
parent b9ae5fca
...@@ -125,6 +125,7 @@ source_set("settings") { ...@@ -125,6 +125,7 @@ source_set("settings") {
"//ios/chrome/browser/browser_state", "//ios/chrome/browser/browser_state",
"//ios/chrome/browser/browser_state:browser_state_impl", "//ios/chrome/browser/browser_state:browser_state_impl",
"//ios/chrome/browser/browsing_data", "//ios/chrome/browser/browsing_data",
"//ios/chrome/browser/browsing_data:feature_flags",
"//ios/chrome/browser/content_settings", "//ios/chrome/browser/content_settings",
"//ios/chrome/browser/favicon", "//ios/chrome/browser/favicon",
"//ios/chrome/browser/feature_engagement", "//ios/chrome/browser/feature_engagement",
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "components/unified_consent/feature.h" #include "components/unified_consent/feature.h"
#include "ios/chrome/browser/application_context.h" #include "ios/chrome/browser/application_context.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h" #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
#include "ios/chrome/browser/browsing_data/browsing_data_features.h"
#include "ios/chrome/browser/chrome_url_constants.h" #include "ios/chrome/browser/chrome_url_constants.h"
#include "ios/chrome/browser/pref_names.h" #include "ios/chrome/browser/pref_names.h"
#include "ios/chrome/browser/system_flags.h" #include "ios/chrome/browser/system_flags.h"
...@@ -383,7 +384,7 @@ typedef NS_ENUM(NSInteger, ItemType) { ...@@ -383,7 +384,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
} }
break; break;
case ItemTypeClearBrowsingDataClear: case ItemTypeClearBrowsingDataClear:
if (base::FeatureList::IsEnabled(kSettingsRefresh)) { if (IsNewClearBrowsingDataUIEnabled()) {
ClearBrowsingDataTableViewController* clearBrowsingDataViewController = ClearBrowsingDataTableViewController* clearBrowsingDataViewController =
[[ClearBrowsingDataTableViewController alloc] [[ClearBrowsingDataTableViewController alloc]
initWithBrowserState:_browserState]; initWithBrowserState:_browserState];
......
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