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

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

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

Bug: 1042208
Change-Id: I0ef69eaf7d6bbd882e4cab49441f092e6fb2fa68
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017524Reviewed-by: default avatarJustin Cohen <justincohen@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735280}
parent 487074cb
......@@ -25,13 +25,12 @@ class WebState;
: ChromeCoordinator <LogoAnimationControllerOwnerOwner>
// Initializes this Coordinator with its |browserState|.
- (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)browserState
- (instancetype)initWithBrowserState:(ChromeBrowserState*)browserState
NS_DESIGNATED_INITIALIZER;
- (instancetype)initWithBaseViewController:(UIViewController*)viewController
NS_UNAVAILABLE;
- (instancetype)initWithBaseViewController:(UIViewController*)viewController
browserState:
(ios::ChromeBrowserState*)browserState
browserState:(ChromeBrowserState*)browserState
NS_UNAVAILABLE;
- (instancetype)initWithBaseViewController:(UIViewController*)viewController
browser:(Browser*)browser NS_UNAVAILABLE;
......
......@@ -35,7 +35,7 @@
#pragma mark - ChromeCoordinator
- (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)browserState {
- (instancetype)initWithBrowserState:(ChromeBrowserState*)browserState {
return [super initWithBaseViewController:nil browserState:browserState];
}
......
......@@ -57,7 +57,7 @@ class NewTabPageCoordinatorTest : public PlatformTest {
void CreateCoordinator(bool off_the_record) {
if (off_the_record) {
ios::ChromeBrowserState* otr_state =
ChromeBrowserState* otr_state =
browser_state_->GetOffTheRecordChromeBrowserState();
coordinator_ =
[[NewTabPageCoordinator alloc] initWithBrowserState:otr_state];
......
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