Commit bfc04647 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

[ios] Use chrome_browser_state_forward.h in /ios/chrome/browser/ui/settings

Instead of forward declaring ChromeBrowserState in the ios
namespace, use a header. This will allow moving the class
to the global namespace without having to change all the
forward declaration at the same time.

This CL was uploaded by git cl split.

R=sczs@chromium.org

Bug: 1042208
Change-Id: I388055914d1180bf7ecd228c42cb019bfdf5f7a0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2007427
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarSergio Collazos <sczs@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734157}
parent 8c27943e
...@@ -5,14 +5,11 @@ ...@@ -5,14 +5,11 @@
#ifndef IOS_CHROME_BROWSER_UI_SETTINGS_AUTOFILL_AUTOFILL_CREDIT_CARD_TABLE_VIEW_CONTROLLER_H_ #ifndef IOS_CHROME_BROWSER_UI_SETTINGS_AUTOFILL_AUTOFILL_CREDIT_CARD_TABLE_VIEW_CONTROLLER_H_
#define IOS_CHROME_BROWSER_UI_SETTINGS_AUTOFILL_AUTOFILL_CREDIT_CARD_TABLE_VIEW_CONTROLLER_H_ #define IOS_CHROME_BROWSER_UI_SETTINGS_AUTOFILL_AUTOFILL_CREDIT_CARD_TABLE_VIEW_CONTROLLER_H_
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
#import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h" #import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h"
class Browser; class Browser;
namespace ios {
class ChromeBrowserState;
}
// The table view for the Autofill settings. // The table view for the Autofill settings.
@interface AutofillCreditCardTableViewController @interface AutofillCreditCardTableViewController
: SettingsRootTableViewController : SettingsRootTableViewController
......
...@@ -5,12 +5,9 @@ ...@@ -5,12 +5,9 @@
#ifndef IOS_CHROME_BROWSER_UI_SETTINGS_AUTOFILL_AUTOFILL_PROFILE_TABLE_VIEW_CONTROLLER_H_ #ifndef IOS_CHROME_BROWSER_UI_SETTINGS_AUTOFILL_AUTOFILL_PROFILE_TABLE_VIEW_CONTROLLER_H_
#define IOS_CHROME_BROWSER_UI_SETTINGS_AUTOFILL_AUTOFILL_PROFILE_TABLE_VIEW_CONTROLLER_H_ #define IOS_CHROME_BROWSER_UI_SETTINGS_AUTOFILL_AUTOFILL_PROFILE_TABLE_VIEW_CONTROLLER_H_
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
#import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h" #import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h"
namespace ios {
class ChromeBrowserState;
} // namespace ios
// The TableView for the Autofill settings. // The TableView for the Autofill settings.
@interface AutofillProfileTableViewController : SettingsRootTableViewController @interface AutofillProfileTableViewController : SettingsRootTableViewController
......
...@@ -5,12 +5,9 @@ ...@@ -5,12 +5,9 @@
#ifndef IOS_CHROME_BROWSER_UI_SETTINGS_BANDWIDTH_MANAGEMENT_TABLE_VIEW_CONTROLLER_H_ #ifndef IOS_CHROME_BROWSER_UI_SETTINGS_BANDWIDTH_MANAGEMENT_TABLE_VIEW_CONTROLLER_H_
#define IOS_CHROME_BROWSER_UI_SETTINGS_BANDWIDTH_MANAGEMENT_TABLE_VIEW_CONTROLLER_H_ #define IOS_CHROME_BROWSER_UI_SETTINGS_BANDWIDTH_MANAGEMENT_TABLE_VIEW_CONTROLLER_H_
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
#import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h" #import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h"
namespace ios {
class ChromeBrowserState;
} // namespace ios
// Controller for the UI that allows the user to change settings that affect // Controller for the UI that allows the user to change settings that affect
// bandwidth usage: prefetching and the data reduction proxy. // bandwidth usage: prefetching and the data reduction proxy.
@interface BandwidthManagementTableViewController @interface BandwidthManagementTableViewController
......
...@@ -5,12 +5,9 @@ ...@@ -5,12 +5,9 @@
#ifndef IOS_CHROME_BROWSER_UI_SETTINGS_BLOCK_POPUPS_TABLE_VIEW_CONTROLLER_H_ #ifndef IOS_CHROME_BROWSER_UI_SETTINGS_BLOCK_POPUPS_TABLE_VIEW_CONTROLLER_H_
#define IOS_CHROME_BROWSER_UI_SETTINGS_BLOCK_POPUPS_TABLE_VIEW_CONTROLLER_H_ #define IOS_CHROME_BROWSER_UI_SETTINGS_BLOCK_POPUPS_TABLE_VIEW_CONTROLLER_H_
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
#import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h" #import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h"
namespace ios {
class ChromeBrowserState;
} // namespace ios
// Controller for the UI that allows the user to block popups. // Controller for the UI that allows the user to block popups.
@interface BlockPopupsTableViewController : SettingsRootTableViewController @interface BlockPopupsTableViewController : SettingsRootTableViewController
......
...@@ -8,13 +8,10 @@ ...@@ -8,13 +8,10 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#include "base/ios/block_types.h" #include "base/ios/block_types.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
@class ListItem; @class ListItem;
namespace ios {
class ChromeBrowserState;
}
namespace browsing_data { namespace browsing_data {
enum class TimePeriod; enum class TimePeriod;
} }
......
...@@ -6,11 +6,9 @@ ...@@ -6,11 +6,9 @@
#define IOS_CHROME_BROWSER_UI_SETTINGS_CLEAR_BROWSING_DATA_CLEAR_BROWSING_DATA_MANAGER_H_ #define IOS_CHROME_BROWSER_UI_SETTINGS_CLEAR_BROWSING_DATA_CLEAR_BROWSING_DATA_MANAGER_H_
#include "components/browsing_data/core/counters/browsing_data_counter.h" #include "components/browsing_data/core/counters/browsing_data_counter.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
#import "ios/chrome/browser/ui/list_model/list_model.h" #import "ios/chrome/browser/ui/list_model/list_model.h"
namespace ios {
class ChromeBrowserState;
}
class BrowsingDataRemover; class BrowsingDataRemover;
enum class BrowsingDataRemoveMask; enum class BrowsingDataRemoveMask;
......
...@@ -5,12 +5,9 @@ ...@@ -5,12 +5,9 @@
#ifndef IOS_CHROME_BROWSER_UI_SETTINGS_CLEAR_BROWSING_DATA_CLEAR_BROWSING_DATA_TABLE_VIEW_CONTROLLER_H_ #ifndef IOS_CHROME_BROWSER_UI_SETTINGS_CLEAR_BROWSING_DATA_CLEAR_BROWSING_DATA_TABLE_VIEW_CONTROLLER_H_
#define IOS_CHROME_BROWSER_UI_SETTINGS_CLEAR_BROWSING_DATA_CLEAR_BROWSING_DATA_TABLE_VIEW_CONTROLLER_H_ #define IOS_CHROME_BROWSER_UI_SETTINGS_CLEAR_BROWSING_DATA_CLEAR_BROWSING_DATA_TABLE_VIEW_CONTROLLER_H_
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
#import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h" #import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h"
namespace ios {
class ChromeBrowserState;
}
@protocol ApplicationCommands; @protocol ApplicationCommands;
@protocol BrowsingDataCommands; @protocol BrowsingDataCommands;
@protocol ClearBrowsingDataLocalCommands; @protocol ClearBrowsingDataLocalCommands;
......
...@@ -5,12 +5,9 @@ ...@@ -5,12 +5,9 @@
#ifndef IOS_CHROME_BROWSER_UI_SETTINGS_CONTENT_SETTINGS_TABLE_VIEW_CONTROLLER_H_ #ifndef IOS_CHROME_BROWSER_UI_SETTINGS_CONTENT_SETTINGS_TABLE_VIEW_CONTROLLER_H_
#define IOS_CHROME_BROWSER_UI_SETTINGS_CONTENT_SETTINGS_TABLE_VIEW_CONTROLLER_H_ #define IOS_CHROME_BROWSER_UI_SETTINGS_CONTENT_SETTINGS_TABLE_VIEW_CONTROLLER_H_
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
#import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h" #import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h"
namespace ios {
class ChromeBrowserState;
} // namespace ios
// Controller for the UI that allows the user to change content settings like // Controller for the UI that allows the user to change content settings like
// blocking popups. // blocking popups.
@interface ContentSettingsTableViewController : SettingsRootTableViewController @interface ContentSettingsTableViewController : SettingsRootTableViewController
......
...@@ -5,12 +5,9 @@ ...@@ -5,12 +5,9 @@
#ifndef IOS_CHROME_BROWSER_UI_SETTINGS_HANDOFF_TABLE_VIEW_CONTROLLER_H_ #ifndef IOS_CHROME_BROWSER_UI_SETTINGS_HANDOFF_TABLE_VIEW_CONTROLLER_H_
#define IOS_CHROME_BROWSER_UI_SETTINGS_HANDOFF_TABLE_VIEW_CONTROLLER_H_ #define IOS_CHROME_BROWSER_UI_SETTINGS_HANDOFF_TABLE_VIEW_CONTROLLER_H_
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
#import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h" #import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h"
namespace ios {
class ChromeBrowserState;
} // namespace ios
// This View Controller is responsible for managing the settings related to // This View Controller is responsible for managing the settings related to
// Handoff. // Handoff.
@interface HandoffTableViewController : SettingsRootTableViewController @interface HandoffTableViewController : SettingsRootTableViewController
......
...@@ -7,13 +7,10 @@ ...@@ -7,13 +7,10 @@
#include <Foundation/Foundation.h> #include <Foundation/Foundation.h>
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
#import "ios/chrome/browser/ui/settings/language/language_settings_commands.h" #import "ios/chrome/browser/ui/settings/language/language_settings_commands.h"
#import "ios/chrome/browser/ui/settings/language/language_settings_data_source.h" #import "ios/chrome/browser/ui/settings/language/language_settings_data_source.h"
namespace ios {
class ChromeBrowserState;
} // namespace ios
@interface LanguageSettingsMediator @interface LanguageSettingsMediator
: NSObject <LanguageSettingsDataSource, LanguageSettingsCommands> : NSObject <LanguageSettingsDataSource, LanguageSettingsCommands>
......
...@@ -5,14 +5,11 @@ ...@@ -5,14 +5,11 @@
#ifndef IOS_CHROME_BROWSER_UI_SETTINGS_PASSWORD_PASSWORDS_TABLE_VIEW_CONTROLLER_H_ #ifndef IOS_CHROME_BROWSER_UI_SETTINGS_PASSWORD_PASSWORDS_TABLE_VIEW_CONTROLLER_H_
#define IOS_CHROME_BROWSER_UI_SETTINGS_PASSWORD_PASSWORDS_TABLE_VIEW_CONTROLLER_H_ #define IOS_CHROME_BROWSER_UI_SETTINGS_PASSWORD_PASSWORDS_TABLE_VIEW_CONTROLLER_H_
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
#import "ios/chrome/browser/ui/settings/password/password_details_table_view_controller_delegate.h" #import "ios/chrome/browser/ui/settings/password/password_details_table_view_controller_delegate.h"
#import "ios/chrome/browser/ui/settings/settings_navigation_controller.h" #import "ios/chrome/browser/ui/settings/settings_navigation_controller.h"
#import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h" #import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h"
namespace ios {
class ChromeBrowserState;
} // namespace ios
@protocol ReauthenticationProtocol; @protocol ReauthenticationProtocol;
@class PasswordExporter; @class PasswordExporter;
......
...@@ -5,12 +5,9 @@ ...@@ -5,12 +5,9 @@
#ifndef IOS_CHROME_BROWSER_UI_SETTINGS_PRIVACY_TABLE_VIEW_CONTROLLER_H_ #ifndef IOS_CHROME_BROWSER_UI_SETTINGS_PRIVACY_TABLE_VIEW_CONTROLLER_H_
#define IOS_CHROME_BROWSER_UI_SETTINGS_PRIVACY_TABLE_VIEW_CONTROLLER_H_ #define IOS_CHROME_BROWSER_UI_SETTINGS_PRIVACY_TABLE_VIEW_CONTROLLER_H_
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
#import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h" #import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h"
namespace ios {
class ChromeBrowserState;
} // namespace ios
// The accessibility identifier of the privacy settings collection view. // The accessibility identifier of the privacy settings collection view.
extern NSString* const kPrivacyTableViewId; extern NSString* const kPrivacyTableViewId;
......
...@@ -5,12 +5,9 @@ ...@@ -5,12 +5,9 @@
#ifndef IOS_CHROME_BROWSER_UI_SETTINGS_SEARCH_ENGINE_TABLE_VIEW_CONTROLLER_H_ #ifndef IOS_CHROME_BROWSER_UI_SETTINGS_SEARCH_ENGINE_TABLE_VIEW_CONTROLLER_H_
#define IOS_CHROME_BROWSER_UI_SETTINGS_SEARCH_ENGINE_TABLE_VIEW_CONTROLLER_H_ #define IOS_CHROME_BROWSER_UI_SETTINGS_SEARCH_ENGINE_TABLE_VIEW_CONTROLLER_H_
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
#import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h" #import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h"
namespace ios {
class ChromeBrowserState;
} // namespace ios
// This class is the table view for the Search Engine settings. // This class is the table view for the Search Engine settings.
@interface SearchEngineTableViewController : SettingsRootTableViewController @interface SearchEngineTableViewController : SettingsRootTableViewController
......
...@@ -7,13 +7,10 @@ ...@@ -7,13 +7,10 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
#import "ios/chrome/browser/sync/sync_observer_bridge.h" #import "ios/chrome/browser/sync/sync_observer_bridge.h"
#import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h" #import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h"
namespace ios {
class ChromeBrowserState;
} // namespace ios
namespace sync_encryption_passphrase { namespace sync_encryption_passphrase {
typedef NS_ENUM(NSInteger, SectionIdentifier) { typedef NS_ENUM(NSInteger, SectionIdentifier) {
SectionIdentifierPassphrase = kSectionIdentifierEnumZero, SectionIdentifierPassphrase = kSectionIdentifierEnumZero,
......
...@@ -5,12 +5,9 @@ ...@@ -5,12 +5,9 @@
#ifndef IOS_CHROME_BROWSER_UI_SETTINGS_SYNC_SYNC_ENCRYPTION_TABLE_VIEW_CONTROLLER_H_ #ifndef IOS_CHROME_BROWSER_UI_SETTINGS_SYNC_SYNC_ENCRYPTION_TABLE_VIEW_CONTROLLER_H_
#define IOS_CHROME_BROWSER_UI_SETTINGS_SYNC_SYNC_ENCRYPTION_TABLE_VIEW_CONTROLLER_H_ #define IOS_CHROME_BROWSER_UI_SETTINGS_SYNC_SYNC_ENCRYPTION_TABLE_VIEW_CONTROLLER_H_
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
#import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h" #import "ios/chrome/browser/ui/settings/settings_root_table_view_controller.h"
namespace ios {
class ChromeBrowserState;
} // namespace ios
// Controller to allow user to specify encryption passphrase for Sync. // Controller to allow user to specify encryption passphrase for Sync.
@interface SyncEncryptionTableViewController : SettingsRootTableViewController @interface SyncEncryptionTableViewController : SettingsRootTableViewController
......
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