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

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

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=noyau@chromium.org

Bug: 1042208
Change-Id: Iebe7231c7edbd4508ea1b9bd34c08c5f9c1a89eb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2007583
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarEric Noyau <noyau@chromium.org>
Commit-Queue: Eric Noyau <noyau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733371}
parent bda0fa77
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#import <UIKit/UIKit.h> #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" #import "ios/chrome/browser/ui/table_view/chrome_table_view_controller.h"
@class BookmarkEditViewController; @class BookmarkEditViewController;
...@@ -16,10 +17,6 @@ namespace bookmarks { ...@@ -16,10 +17,6 @@ namespace bookmarks {
class BookmarkNode; class BookmarkNode;
} // namespace bookmarks } // namespace bookmarks
namespace ios {
class ChromeBrowserState;
} // namespace ios
@protocol BookmarkEditViewControllerDelegate @protocol BookmarkEditViewControllerDelegate
// Called when the edited bookmark is set for deletion. // Called when the edited bookmark is set for deletion.
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#import <UIKit/UIKit.h> #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" #import "ios/chrome/browser/ui/table_view/chrome_table_view_controller.h"
@class BookmarkFolderEditorViewController; @class BookmarkFolderEditorViewController;
...@@ -16,10 +17,6 @@ class BookmarkModel; ...@@ -16,10 +17,6 @@ class BookmarkModel;
class BookmarkNode; class BookmarkNode;
} // namespace bookmarks } // namespace bookmarks
namespace ios {
class ChromeBrowserState;
} // namespace ios
@protocol BookmarkFolderEditorViewControllerDelegate @protocol BookmarkFolderEditorViewControllerDelegate
// Called when the controller successfully created or edited |folder|. // Called when the controller successfully created or edited |folder|.
- (void)bookmarkFolderEditor:(BookmarkFolderEditorViewController*)folderEditor - (void)bookmarkFolderEditor:(BookmarkFolderEditorViewController*)folderEditor
......
...@@ -7,13 +7,11 @@ ...@@ -7,13 +7,11 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
@protocol BookmarkHomeConsumer; @protocol BookmarkHomeConsumer;
@class BookmarkHomeSharedState; @class BookmarkHomeSharedState;
namespace ios {
class ChromeBrowserState;
}
// BookmarkHomeMediator manages model interactions for the // BookmarkHomeMediator manages model interactions for the
// BookmarkHomeViewController. // BookmarkHomeViewController.
@interface BookmarkHomeMediator : NSObject @interface BookmarkHomeMediator : NSObject
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <set> #include <set>
#include <vector> #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" #import "ios/chrome/browser/ui/table_view/chrome_table_view_controller.h"
@protocol ApplicationCommands; @protocol ApplicationCommands;
...@@ -19,9 +20,6 @@ namespace bookmarks { ...@@ -19,9 +20,6 @@ namespace bookmarks {
class BookmarkNode; class BookmarkNode;
} // namespace bookmarks } // namespace bookmarks
class GURL; class GURL;
namespace ios {
class ChromeBrowserState;
} // namespace ios
class WebStateList; class WebStateList;
@protocol BookmarkHomeViewControllerDelegate @protocol BookmarkHomeViewControllerDelegate
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
@protocol ApplicationCommands; @protocol ApplicationCommands;
@protocol BrowserCommands; @protocol BrowserCommands;
@protocol BookmarkInteractionControllerDelegate; @protocol BookmarkInteractionControllerDelegate;
...@@ -14,10 +16,6 @@ namespace bookmarks { ...@@ -14,10 +16,6 @@ namespace bookmarks {
class BookmarkNode; class BookmarkNode;
} }
namespace ios {
class ChromeBrowserState;
}
namespace web { namespace web {
class WebState; class WebState;
} }
......
...@@ -7,14 +7,12 @@ ...@@ -7,14 +7,12 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
namespace bookmarks { namespace bookmarks {
class BookmarkNode; class BookmarkNode;
} // namespace bookmarks } // namespace bookmarks
namespace ios {
class ChromeBrowserState;
} // namespace ios
namespace user_prefs { namespace user_prefs {
class PrefRegistrySyncable; class PrefRegistrySyncable;
} // namespace user_prefs } // namespace user_prefs
......
...@@ -7,14 +7,12 @@ ...@@ -7,14 +7,12 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
@protocol SigninPresenter; @protocol SigninPresenter;
@class SigninPromoViewConfigurator; @class SigninPromoViewConfigurator;
@class SigninPromoViewMediator; @class SigninPromoViewMediator;
namespace ios {
class ChromeBrowserState;
} // namespace ios
@protocol BookmarkPromoControllerDelegate @protocol BookmarkPromoControllerDelegate
// Controls the state of the promo. // Controls the state of the promo.
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "base/strings/string16.h" #include "base/strings/string16.h"
#include "base/time/time.h" #include "base/time/time.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
class GURL; class GURL;
@class MDCSnackbarMessage; @class MDCSnackbarMessage;
...@@ -22,10 +23,6 @@ class BookmarkModel; ...@@ -22,10 +23,6 @@ class BookmarkModel;
class BookmarkNode; class BookmarkNode;
} // namespace bookmarks } // namespace bookmarks
namespace ios {
class ChromeBrowserState;
} // namespace ios
namespace bookmark_utils_ios { namespace bookmark_utils_ios {
typedef std::vector<const bookmarks::BookmarkNode*> NodeVector; typedef std::vector<const bookmarks::BookmarkNode*> NodeVector;
......
...@@ -8,16 +8,13 @@ ...@@ -8,16 +8,13 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#include "base/macros.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" #import "ios/chrome/browser/sync/sync_observer_bridge.h"
namespace signin { namespace signin {
class IdentityManager; class IdentityManager;
} }
namespace ios {
class ChromeBrowserState;
}
namespace sync_bookmarks { namespace sync_bookmarks {
// Bridge class that will notify the panel when the remote bookmarks content // Bridge class that will notify the panel when the remote bookmarks content
......
...@@ -7,9 +7,7 @@ ...@@ -7,9 +7,7 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
namespace ios { #include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
class ChromeBrowserState;
} // namespace ios
// This object is a convenience ObjC wrapper around UndoManager. // This object is a convenience ObjC wrapper around UndoManager.
// On construction, it registers itself as an observer of the UndoManager. // On construction, it registers itself as an observer of the 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