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

[ios] Fix uses of ios::ChromeBrowserState in /ios/chrome/browser/ui/bookmarks

The ChromeBrowserState has been moved from the "ios" namespace
to the global namespace by http://crrev.com/c/2014913. Fix the
uses from ios::ChromeBrowserState to ChromeBrowserState.

Also remove includes of chrome_browser_state_forward.h and use
a simple forward declaration instead (since the old name is no
longer necessary).

This CL was uploaded by git cl split.

R=noyau@chromium.org

Bug: 1042208
Change-Id: Ic10c1f5b1f65ac65d14cea64f0ad688aef5eb971
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2014973Reviewed-by: default avatarEric Noyau <noyau@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734989}
parent 5eda9c0c
......@@ -30,7 +30,7 @@
#pragma mark - Public Interface
+ (void)clearBookmarksPositionCache {
ios::ChromeBrowserState* browser_state =
ChromeBrowserState* browser_state =
chrome_test_util::GetOriginalBrowserState();
[BookmarkPathCache
clearBookmarkTopMostRowCacheWithPrefService:browser_state->GetPrefs()];
......@@ -283,7 +283,7 @@
}
+ (NSError*)verifyPromoAlreadySeen:(BOOL)seen {
ios::ChromeBrowserState* browserState =
ChromeBrowserState* browserState =
chrome_test_util::GetOriginalBrowserState();
PrefService* prefs = browserState->GetPrefs();
if (prefs->GetBoolean(prefs::kIosBookmarkPromoAlreadySeen) == seen) {
......
......@@ -6,12 +6,12 @@
#import <UIKit/UIKit.h>
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
#import "ios/chrome/browser/ui/table_view/chrome_table_view_controller.h"
@class BookmarkEditViewController;
@class BookmarkFolderViewController;
@protocol BrowserCommands;
class ChromeBrowserState;
namespace bookmarks {
class BookmarkNode;
......@@ -52,7 +52,7 @@ class BookmarkNode;
// |bookmark|: mustn't be NULL at initialization time. It also mustn't be a
// folder.
- (instancetype)initWithBookmark:(const bookmarks::BookmarkNode*)bookmark
browserState:(ios::ChromeBrowserState*)browserState
browserState:(ChromeBrowserState*)browserState
dispatcher:(id<BrowserCommands>)dispatcher
NS_DESIGNATED_INITIALIZER;
- (instancetype)initWithStyle:(UITableViewStyle)style NS_UNAVAILABLE;
......
......@@ -105,7 +105,7 @@ const CGFloat kEstimatedTableSectionFooterHeight = 40;
// Redefined to be readwrite.
@property(nonatomic, strong) BookmarkFolderViewController* folderViewController;
@property(nonatomic, assign) ios::ChromeBrowserState* browserState;
@property(nonatomic, assign) ChromeBrowserState* browserState;
// Dispatcher for sending commands.
@property(nonatomic, readonly, weak) id<BrowserCommands> dispatcher;
......@@ -179,7 +179,7 @@ const CGFloat kEstimatedTableSectionFooterHeight = 40;
#pragma mark - Lifecycle
- (instancetype)initWithBookmark:(const BookmarkNode*)bookmark
browserState:(ios::ChromeBrowserState*)browserState
browserState:(ChromeBrowserState*)browserState
dispatcher:(id<BrowserCommands>)dispatcher {
DCHECK(bookmark);
DCHECK(browserState);
......
......@@ -6,11 +6,11 @@
#import <UIKit/UIKit.h>
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
#import "ios/chrome/browser/ui/table_view/chrome_table_view_controller.h"
@class BookmarkFolderEditorViewController;
@protocol BrowserCommands;
class ChromeBrowserState;
namespace bookmarks {
class BookmarkModel;
......@@ -60,7 +60,7 @@ class BookmarkNode;
+ (instancetype)
folderEditorWithBookmarkModel:(bookmarks::BookmarkModel*)bookmarkModel
folder:(const bookmarks::BookmarkNode*)folder
browserState:(ios::ChromeBrowserState*)browserState
browserState:(ChromeBrowserState*)browserState
dispatcher:(id<BrowserCommands>)dispatcher;
- (instancetype)initWithStyle:(UITableViewStyle)style NS_UNAVAILABLE;
......
......@@ -64,7 +64,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
}
@property(nonatomic, assign) BOOL editingExistingFolder;
@property(nonatomic, assign) bookmarks::BookmarkModel* bookmarkModel;
@property(nonatomic, assign) ios::ChromeBrowserState* browserState;
@property(nonatomic, assign) ChromeBrowserState* browserState;
@property(nonatomic, assign) const BookmarkNode* folder;
@property(nonatomic, strong) BookmarkFolderViewController* folderViewController;
@property(nonatomic, assign) const BookmarkNode* parentFolder;
......@@ -122,11 +122,11 @@ typedef NS_ENUM(NSInteger, ItemType) {
return folderCreator;
}
+ (instancetype)
folderEditorWithBookmarkModel:(bookmarks::BookmarkModel*)bookmarkModel
folder:(const BookmarkNode*)folder
browserState:(ios::ChromeBrowserState*)browserState
dispatcher:(id<BrowserCommands>)dispatcher {
+ (instancetype)folderEditorWithBookmarkModel:
(bookmarks::BookmarkModel*)bookmarkModel
folder:(const BookmarkNode*)folder
browserState:(ChromeBrowserState*)browserState
dispatcher:(id<BrowserCommands>)dispatcher {
DCHECK(folder);
DCHECK(!bookmarkModel->is_permanent_node(folder));
DCHECK(browserState);
......
......@@ -7,8 +7,7 @@
#import <Foundation/Foundation.h>
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
class ChromeBrowserState;
@protocol BookmarkHomeConsumer;
@class BookmarkHomeSharedState;
......@@ -19,7 +18,7 @@
@property(nonatomic, weak) id<BookmarkHomeConsumer> consumer;
- (instancetype)initWithSharedState:(BookmarkHomeSharedState*)sharedState
browserState:(ios::ChromeBrowserState*)browserState
browserState:(ChromeBrowserState*)browserState
NS_DESIGNATED_INITIALIZER;
- (instancetype)init NS_UNAVAILABLE;
......
......@@ -52,7 +52,7 @@ const int kMaxBookmarksSearchResults = 50;
@property(nonatomic, strong) BookmarkHomeSharedState* sharedState;
// The browser state for this mediator.
@property(nonatomic, assign) ios::ChromeBrowserState* browserState;
@property(nonatomic, assign) ChromeBrowserState* browserState;
// The controller managing the display of the promo cell and the promo view
// controller.
......@@ -67,7 +67,7 @@ const int kMaxBookmarksSearchResults = 50;
@synthesize sharedState = _sharedState;
- (instancetype)initWithSharedState:(BookmarkHomeSharedState*)sharedState
browserState:(ios::ChromeBrowserState*)browserState {
browserState:(ChromeBrowserState*)browserState {
if ((self = [super init])) {
_sharedState = sharedState;
_browserState = browserState;
......
......@@ -10,7 +10,6 @@
#include <set>
#include <vector>
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
#import "ios/chrome/browser/ui/table_view/chrome_table_view_controller.h"
@protocol ApplicationCommands;
......@@ -19,6 +18,7 @@
namespace bookmarks {
class BookmarkNode;
} // namespace bookmarks
class ChromeBrowserState;
class GURL;
class WebStateList;
......@@ -50,7 +50,7 @@ class WebStateList;
// Initializers.
- (instancetype)
initWithBrowserState:(ios::ChromeBrowserState*)browserState
initWithBrowserState:(ChromeBrowserState*)browserState
dispatcher:(id<ApplicationCommands, BrowserCommands>)dispatcher
webStateList:(WebStateList*)webStateList NS_DESIGNATED_INITIALIZER;
- (instancetype)initWithStyle:(UITableViewStyle)tableViewStyle NS_UNAVAILABLE;
......
......@@ -134,7 +134,7 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
@property(nonatomic, assign) bookmarks::BookmarkModel* bookmarks;
// The user's browser state model used.
@property(nonatomic, assign) ios::ChromeBrowserState* browserState;
@property(nonatomic, assign) ChromeBrowserState* browserState;
// The mediator that provides data for this view controller.
@property(nonatomic, strong) BookmarkHomeMediator* mediator;
......@@ -206,7 +206,7 @@ std::vector<GURL> GetUrlsToOpen(const std::vector<const BookmarkNode*>& nodes) {
#pragma mark - Initializer
- (instancetype)
initWithBrowserState:(ios::ChromeBrowserState*)browserState
initWithBrowserState:(ChromeBrowserState*)browserState
dispatcher:(id<ApplicationCommands, BrowserCommands>)dispatcher
webStateList:(WebStateList*)webStateList {
DCHECK(browserState);
......
......@@ -6,12 +6,13 @@
#import <UIKit/UIKit.h>
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
@protocol ApplicationCommands;
@protocol BrowserCommands;
@protocol BookmarkInteractionControllerDelegate;
class ChromeBrowserState;
namespace bookmarks {
class BookmarkNode;
}
......@@ -30,7 +31,7 @@ class WebStateList;
@property(nonatomic, weak) id<BookmarkInteractionControllerDelegate> delegate;
- (instancetype)
initWithBrowserState:(ios::ChromeBrowserState*)browserState
initWithBrowserState:(ChromeBrowserState*)browserState
parentController:(UIViewController*)parentController
dispatcher:(id<ApplicationCommands, BrowserCommands>)dispatcher
webStateList:(WebStateList*)webStateList NS_DESIGNATED_INITIALIZER;
......
......@@ -72,11 +72,11 @@ enum class PresentedState {
BookmarkHomeViewControllerDelegate,
TableViewPresentationControllerDelegate> {
// The browser state of the current user.
ios::ChromeBrowserState* _currentBrowserState; // weak
ChromeBrowserState* _currentBrowserState; // weak
// The browser state to use, might be different from _currentBrowserState if
// it is incognito.
ios::ChromeBrowserState* _browserState; // weak
ChromeBrowserState* _browserState; // weak
// The parent controller on top of which the UI needs to be presented.
__weak UIViewController* _parentController;
......@@ -156,7 +156,7 @@ enum class PresentedState {
@synthesize mediator = _mediator;
- (instancetype)
initWithBrowserState:(ios::ChromeBrowserState*)browserState
initWithBrowserState:(ChromeBrowserState*)browserState
parentController:(UIViewController*)parentController
dispatcher:(id<ApplicationCommands, BrowserCommands>)dispatcher
webStateList:(WebStateList*)webStateList {
......
......@@ -7,7 +7,7 @@
#import <UIKit/UIKit.h>
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
class ChromeBrowserState;
namespace bookmarks {
class BookmarkNode;
......@@ -24,7 +24,7 @@ class GURL;
@interface BookmarkMediator : NSObject
- (instancetype)init NS_UNAVAILABLE;
- (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)browserState
- (instancetype)initWithBrowserState:(ChromeBrowserState*)browserState
NS_DESIGNATED_INITIALIZER;
// Registers the feature preferences.
......@@ -33,9 +33,9 @@ class GURL;
// Accesses the default folder for bookmarks. The default folder is Mobile
// Bookmarks.
+ (const bookmarks::BookmarkNode*)folderForNewBookmarksInBrowserState:
(ios::ChromeBrowserState*)browserState;
(ChromeBrowserState*)browserState;
+ (void)setFolderForNewBookmarks:(const bookmarks::BookmarkNode*)folder
inBrowserState:(ios::ChromeBrowserState*)browserState;
inBrowserState:(ChromeBrowserState*)browserState;
// Adds a bookmark with a |title| and a |URL| and display a snackbar with an
// |editAction|. Returns a message to be displayed after the Bookmark has been
......
......@@ -37,7 +37,7 @@ const int64_t kLastUsedFolderNone = -1;
@interface BookmarkMediator ()
// BrowserState for this mediator.
@property(nonatomic, assign) ios::ChromeBrowserState* browserState;
@property(nonatomic, assign) ChromeBrowserState* browserState;
@end
......@@ -51,7 +51,7 @@ const int64_t kLastUsedFolderNone = -1;
}
+ (const BookmarkNode*)folderForNewBookmarksInBrowserState:
(ios::ChromeBrowserState*)browserState {
(ChromeBrowserState*)browserState {
bookmarks::BookmarkModel* bookmarks =
ios::BookmarkModelFactory::GetForBrowserState(browserState);
const BookmarkNode* defaultFolder = bookmarks->mobile_node();
......@@ -70,13 +70,13 @@ const int64_t kLastUsedFolderNone = -1;
}
+ (void)setFolderForNewBookmarks:(const BookmarkNode*)folder
inBrowserState:(ios::ChromeBrowserState*)browserState {
inBrowserState:(ChromeBrowserState*)browserState {
DCHECK(folder && folder->is_folder());
browserState->GetPrefs()->SetInt64(prefs::kIosBookmarkFolderDefault,
folder->id());
}
- (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)browserState {
- (instancetype)initWithBrowserState:(ChromeBrowserState*)browserState {
self = [super init];
if (self) {
_browserState = browserState;
......
......@@ -7,8 +7,7 @@
#import <UIKit/UIKit.h>
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
class ChromeBrowserState;
@protocol SigninPresenter;
@class SigninPromoViewConfigurator;
@class SigninPromoViewMediator;
......@@ -38,7 +37,7 @@
@property(nonatomic, readonly) SigninPromoViewMediator* signinPromoViewMediator;
- (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)browserState
- (instancetype)initWithBrowserState:(ChromeBrowserState*)browserState
delegate:
(id<BookmarkPromoControllerDelegate>)delegate
presenter:(id<SigninPresenter>)presenter;
......
......@@ -22,7 +22,7 @@
@interface BookmarkPromoController ()<SigninPromoViewConsumer,
IdentityManagerObserverBridgeDelegate> {
bool _isIncognito;
ios::ChromeBrowserState* _browserState;
ChromeBrowserState* _browserState;
std::unique_ptr<signin::IdentityManagerObserverBridge>
_identityManagerObserverBridge;
}
......@@ -39,7 +39,7 @@
@synthesize shouldShowSigninPromo = _shouldShowSigninPromo;
@synthesize signinPromoViewMediator = _signinPromoViewMediator;
- (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)browserState
- (instancetype)initWithBrowserState:(ChromeBrowserState*)browserState
delegate:
(id<BookmarkPromoControllerDelegate>)delegate
presenter:(id<SigninPresenter>)presenter {
......
......@@ -13,8 +13,8 @@
#include "base/strings/string16.h"
#include "base/time/time.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
class ChromeBrowserState;
class GURL;
@class MDCSnackbarMessage;
......@@ -57,7 +57,7 @@ MDCSnackbarMessage* CreateOrUpdateBookmarkWithUndoToast(
const GURL& url,
const bookmarks::BookmarkNode* folder,
bookmarks::BookmarkModel* bookmark_model,
ios::ChromeBrowserState* browser_state);
ChromeBrowserState* browser_state);
// Updates a bookmark node position, and returns a snackbar with an undo action.
// Returns nil if the operation wasn't successful or there's nothing to undo.
......@@ -66,7 +66,7 @@ MDCSnackbarMessage* UpdateBookmarkPositionWithUndoToast(
const bookmarks::BookmarkNode* folder,
int position,
bookmarks::BookmarkModel* bookmark_model,
ios::ChromeBrowserState* browser_state);
ChromeBrowserState* browser_state);
// Deletes all bookmarks in |model| that are in |bookmarks|, and returns a
// snackbar with an undo action. Returns nil if the operation wasn't successful
......@@ -74,7 +74,7 @@ MDCSnackbarMessage* UpdateBookmarkPositionWithUndoToast(
MDCSnackbarMessage* DeleteBookmarksWithUndoToast(
const std::set<const bookmarks::BookmarkNode*>& bookmarks,
bookmarks::BookmarkModel* model,
ios::ChromeBrowserState* browser_state);
ChromeBrowserState* browser_state);
// Deletes all nodes in |bookmarks|.
void DeleteBookmarks(const std::set<const bookmarks::BookmarkNode*>& bookmarks,
......@@ -87,7 +87,7 @@ MDCSnackbarMessage* MoveBookmarksWithUndoToast(
const std::set<const bookmarks::BookmarkNode*>& bookmarks,
bookmarks::BookmarkModel* model,
const bookmarks::BookmarkNode* folder,
ios::ChromeBrowserState* browser_state);
ChromeBrowserState* browser_state);
// Move all |bookmarks| to the given |folder|.
// Returns whether this method actually moved bookmarks (for example, only
......
......@@ -151,7 +151,7 @@ MDCSnackbarMessage* CreateOrUpdateBookmarkWithUndoToast(
const GURL& url,
const BookmarkNode* folder,
bookmarks::BookmarkModel* bookmark_model,
ios::ChromeBrowserState* browser_state) {
ChromeBrowserState* browser_state) {
DCHECK(!node || node->is_url());
base::string16 titleString = base::SysNSStringToUTF16(title);
......@@ -200,7 +200,7 @@ MDCSnackbarMessage* UpdateBookmarkPositionWithUndoToast(
const bookmarks::BookmarkNode* folder,
int position,
bookmarks::BookmarkModel* bookmark_model,
ios::ChromeBrowserState* browser_state) {
ChromeBrowserState* browser_state) {
DCHECK(node);
DCHECK(folder);
DCHECK(!folder->HasAncestor(node));
......@@ -240,7 +240,7 @@ void DeleteBookmarks(const std::set<const BookmarkNode*>& bookmarks,
MDCSnackbarMessage* DeleteBookmarksWithUndoToast(
const std::set<const BookmarkNode*>& nodes,
bookmarks::BookmarkModel* model,
ios::ChromeBrowserState* browser_state) {
ChromeBrowserState* browser_state) {
size_t nodeCount = nodes.size();
DCHECK_GT(nodeCount, 0u);
......@@ -293,7 +293,7 @@ MDCSnackbarMessage* MoveBookmarksWithUndoToast(
const std::set<const BookmarkNode*>& nodes,
bookmarks::BookmarkModel* model,
const BookmarkNode* folder,
ios::ChromeBrowserState* browser_state) {
ChromeBrowserState* browser_state) {
size_t nodeCount = nodes.size();
DCHECK_GT(nodeCount, 0u);
......
......@@ -8,9 +8,10 @@
#import <Foundation/Foundation.h>
#include "base/macros.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
#import "ios/chrome/browser/sync/sync_observer_bridge.h"
class ChromeBrowserState;
namespace signin {
class IdentityManager;
}
......@@ -22,7 +23,7 @@ namespace sync_bookmarks {
class SyncedBookmarksObserverBridge : public SyncObserverBridge {
public:
SyncedBookmarksObserverBridge(id<SyncObserverModelBridge> delegate,
ios::ChromeBrowserState* browserState);
ChromeBrowserState* browserState);
~SyncedBookmarksObserverBridge() override;
// Returns true if user is signed in.
bool IsSignedIn();
......@@ -31,7 +32,7 @@ class SyncedBookmarksObserverBridge : public SyncObserverBridge {
private:
signin::IdentityManager* identity_manager_;
ios::ChromeBrowserState* browser_state_;
ChromeBrowserState* browser_state_;
DISALLOW_COPY_AND_ASSIGN(SyncedBookmarksObserverBridge);
};
......
......@@ -22,7 +22,7 @@ namespace sync_bookmarks {
SyncedBookmarksObserverBridge::SyncedBookmarksObserverBridge(
id<SyncObserverModelBridge> delegate,
ios::ChromeBrowserState* browserState)
ChromeBrowserState* browserState)
: SyncObserverBridge(
delegate,
ProfileSyncServiceFactory::GetForBrowserState(browserState)),
......
......@@ -7,7 +7,7 @@
#import <Foundation/Foundation.h>
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
class ChromeBrowserState;
// This object is a convenience ObjC wrapper around UndoManager.
// On construction, it registers itself as an observer of the UndoManager.
......@@ -23,7 +23,7 @@
@interface UndoManagerWrapper : NSObject
// Designated initializer.
- (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)browserState;
- (instancetype)initWithBrowserState:(ChromeBrowserState*)browserState;
// Subsequent changes to the BookmarkModel are grouped together so that a single
// undo will revert all changes.
......
......@@ -27,7 +27,7 @@
@synthesize hasUndoManagerChanged = _hasUndoManagerChanged;
@synthesize undoManager = _undoManager;
- (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)browserState {
- (instancetype)initWithBrowserState:(ChromeBrowserState*)browserState {
self = [super init];
if (self) {
_undoManager =
......
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