Commit 6e08afdf authored by Nazerke's avatar Nazerke Committed by Commit Bot

[iOS][cleanup] Rename ClearBrowsingDataLocalCommands to

ClearBrowsingDataUIDelegate.

This CL renames this protocol (ClearBrowsingDataLocalCommands) to
"ClearBrowsingDataUIDelegate", and renames all of the "localDispatcher"
properties to be named "delegate", because
ClearBrowsingDataLocalCommands isn't configured through the dispatcher.

Change-Id: I3eaec89d57dc48039740b6132be0ba85aeaf9ca9
Bug: none.
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2063138
Commit-Queue: Nazerke Kalidolda <nazerke@google.com>
Reviewed-by: default avatarMark Cogan <marq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#743521}
parent 04906b5d
......@@ -6,7 +6,7 @@
#define IOS_CHROME_BROWSER_UI_HISTORY_HISTORY_CLEAR_BROWSING_DATA_COORDINATOR_H_
#import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
#import "ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_local_commands.h"
#import "ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_ui_delegate.h"
enum class UrlLoadStrategy;
......@@ -17,7 +17,7 @@ enum class UrlLoadStrategy;
// Coordinator that presents Clear Browsing Data Table View from History.
// Delegates are hooked up to History coordinator-specific methods.
@interface HistoryClearBrowsingDataCoordinator
: ChromeCoordinator<ClearBrowsingDataLocalCommands>
: ChromeCoordinator <ClearBrowsingDataUIDelegate>
// Unavailable, use -initWithBaseViewController:browser:.
- (instancetype)initWithBaseViewController:(UIViewController*)viewController
......
......@@ -10,8 +10,8 @@
#import "ios/chrome/browser/main/browser.h"
#include "ios/chrome/browser/ui/history/history_ui_delegate.h"
#import "ios/chrome/browser/ui/history/public/history_presentation_delegate.h"
#import "ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_local_commands.h"
#import "ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_table_view_controller.h"
#import "ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_ui_delegate.h"
#import "ios/chrome/browser/ui/table_view/feature_flags.h"
#import "ios/chrome/browser/ui/table_view/table_view_navigation_controller.h"
#import "ios/chrome/browser/ui/table_view/table_view_presentation_controller.h"
......@@ -51,7 +51,7 @@
initWithBrowserState:self.browser->GetBrowserState()];
self.clearBrowsingDataTableViewController.extendedLayoutIncludesOpaqueBars =
YES;
self.clearBrowsingDataTableViewController.localDispatcher = self;
self.clearBrowsingDataTableViewController.delegate = self;
// TODO(crbug.com/1045047): Use HandlerForProtocol after commands protocol
// clean up.
self.clearBrowsingDataTableViewController.dispatcher =
......@@ -115,7 +115,7 @@
}
}
#pragma mark - ClearBrowsingDataLocalCommands
#pragma mark - ClearBrowsingDataUIDelegate
- (void)openURL:(const GURL&)URL {
DCHECK(self.historyClearBrowsingDataNavigationController);
......
......@@ -8,13 +8,13 @@ source_set("clear_browsing_data") {
"browsing_data_counter_wrapper_producer.h",
"browsing_data_counter_wrapper_producer.mm",
"clear_browsing_data_consumer.h",
"clear_browsing_data_local_commands.h",
"clear_browsing_data_manager.h",
"clear_browsing_data_manager.mm",
"clear_browsing_data_table_view_controller.h",
"clear_browsing_data_table_view_controller.mm",
"clear_browsing_data_ui_constants.h",
"clear_browsing_data_ui_constants.mm",
"clear_browsing_data_ui_delegate.h",
"time_range_selector_table_view_controller.h",
"time_range_selector_table_view_controller.mm",
]
......
......@@ -10,7 +10,7 @@
@protocol ApplicationCommands;
@protocol BrowsingDataCommands;
class ChromeBrowserState;
@protocol ClearBrowsingDataLocalCommands;
@protocol ClearBrowsingDataUIDelegate;
// TableView for clearing browsing data (including history,
// cookies, caches, passwords, and autofill).
......@@ -27,7 +27,7 @@ class ChromeBrowserState;
- (void)prepareForDismissal;
// Local Dispatcher for this ClearBrowsingDataTableView.
@property(nonatomic, weak) id<ClearBrowsingDataLocalCommands> localDispatcher;
@property(nonatomic, weak) id<ClearBrowsingDataUIDelegate> delegate;
// The dispatcher used by this ViewController.
@property(nonatomic, weak) id<ApplicationCommands, BrowsingDataCommands>
......
......@@ -20,9 +20,9 @@
#include "ios/chrome/browser/ui/settings/cells/clear_browsing_data_constants.h"
#import "ios/chrome/browser/ui/settings/cells/table_view_clear_browsing_data_item.h"
#import "ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_consumer.h"
#include "ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_local_commands.h"
#import "ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_manager.h"
#import "ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_ui_constants.h"
#include "ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_ui_delegate.h"
#import "ios/chrome/browser/ui/settings/clear_browsing_data/time_range_selector_table_view_controller.h"
#import "ios/chrome/browser/ui/settings/settings_navigation_controller.h"
#import "ios/chrome/browser/ui/table_view/cells/table_view_cells_constants.h"
......@@ -78,7 +78,7 @@
@synthesize clearBrowsingDataBarButton = _clearBrowsingDataBarButton;
@synthesize dataManager = _dataManager;
@synthesize dispatcher = _dispatcher;
@synthesize localDispatcher = _localDispatcher;
@synthesize delegate = _delegate;
@synthesize suppressTableViewUpdates = _suppressTableViewUpdates;
#pragma mark - ViewController Lifecycle.
......@@ -184,7 +184,7 @@
- (void)dismiss {
[self prepareForDismissal];
[self.localDispatcher dismissClearBrowsingData];
[self.delegate dismissClearBrowsingData];
}
#pragma mark - Public Methods
......@@ -288,7 +288,7 @@
- (void)tableViewTextLinkCell:(TableViewTextLinkCell*)cell
didRequestOpenURL:(const GURL&)URL {
GURL copiedURL(URL);
[self.localDispatcher openURL:copiedURL];
[self.delegate openURL:copiedURL];
}
#pragma mark - ClearBrowsingDataConsumer
......@@ -362,7 +362,7 @@
l10n_util::GetNSString(
IDS_IOS_CLEAR_BROWSING_DATA_HISTORY_NOTICE_OPEN_HISTORY_BUTTON)
action:^{
[weakSelf.localDispatcher openURL:GURL(kGoogleMyAccountURL)];
[weakSelf.delegate openURL:GURL(kGoogleMyAccountURL)];
}
style:UIAlertActionStyleDefault];
......
......@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_UI_SETTINGS_CLEAR_BROWSING_DATA_CLEAR_BROWSING_DATA_LOCAL_COMMANDS_H_
#define IOS_CHROME_BROWSER_UI_SETTINGS_CLEAR_BROWSING_DATA_CLEAR_BROWSING_DATA_LOCAL_COMMANDS_H_
#ifndef IOS_CHROME_BROWSER_UI_SETTINGS_CLEAR_BROWSING_DATA_CLEAR_BROWSING_DATA_UI_DELEGATE_H_
#define IOS_CHROME_BROWSER_UI_SETTINGS_CLEAR_BROWSING_DATA_CLEAR_BROWSING_DATA_UI_DELEGATE_H_
#include "base/ios/block_types.h"
class GURL;
@protocol ClearBrowsingDataLocalCommands
@protocol ClearBrowsingDataUIDelegate
// Opens URL in a new non-incognito tab and dismisses the clear browsing data
// view.
......@@ -19,4 +19,4 @@ class GURL;
@end
#endif // IOS_CHROME_BROWSER_UI_SETTINGS_CLEAR_BROWSING_DATA_CLEAR_BROWSING_DATA_LOCAL_COMMANDS_H_
#endif // IOS_CHROME_BROWSER_UI_SETTINGS_CLEAR_BROWSING_DATA_CLEAR_BROWSING_DATA_UI_DELEGATE_H_
......@@ -17,8 +17,8 @@
#import "ios/chrome/browser/ui/commands/open_new_tab_command.h"
#import "ios/chrome/browser/ui/settings/cells/settings_switch_cell.h"
#import "ios/chrome/browser/ui/settings/cells/settings_switch_item.h"
#import "ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_local_commands.h"
#import "ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_table_view_controller.h"
#import "ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_ui_delegate.h"
#import "ios/chrome/browser/ui/settings/handoff_table_view_controller.h"
#import "ios/chrome/browser/ui/settings/settings_navigation_controller.h"
#import "ios/chrome/browser/ui/settings/settings_table_view_controller_constants.h"
......@@ -57,7 +57,7 @@ const char kGoogleServicesSettingsURL[] = "settings://open_google_services";
} // namespace
@interface PrivacyTableViewController () <ClearBrowsingDataLocalCommands,
@interface PrivacyTableViewController () <ClearBrowsingDataUIDelegate,
PrefObserverDelegate> {
ChromeBrowserState* _browserState; // weak
......@@ -211,7 +211,7 @@ const char kGoogleServicesSettingsURL[] = "settings://open_google_services";
ClearBrowsingDataTableViewController* clearBrowsingDataViewController =
[[ClearBrowsingDataTableViewController alloc]
initWithBrowserState:_browserState];
clearBrowsingDataViewController.localDispatcher = self;
clearBrowsingDataViewController.delegate = self;
controller = clearBrowsingDataViewController;
break;
}
......@@ -227,7 +227,7 @@ const char kGoogleServicesSettingsURL[] = "settings://open_google_services";
[tableView deselectRowAtIndexPath:indexPath animated:YES];
}
#pragma mark - ClearBrowsingDataLocalCommands
#pragma mark - ClearBrowsingDataUIDelegate
- (void)openURL:(const GURL&)URL {
DCHECK(self.dispatcher);
......
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