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

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

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

Bug: 1042208
Change-Id: I567615141ce700cd3edc6327de23b331f38c69a4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017468
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarJérôme Lebel <jlebel@chromium.org>
Commit-Queue: Jérôme Lebel <jlebel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734667}
parent 166c1c34
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
(SigninInteractionControllerCompletionCallback)completion { (SigninInteractionControllerCompletionCallback)completion {
signin_metrics::LogSigninAccessPointStarted(_accessPoint, _promoAction); signin_metrics::LogSigninAccessPointStarted(_accessPoint, _promoAction);
_completionCallback = [completion copy]; _completionCallback = [completion copy];
ios::ChromeBrowserState* browserState = _browser->GetBrowserState(); ChromeBrowserState* browserState = _browser->GetBrowserState();
CoreAccountInfo accountInfo = CoreAccountInfo accountInfo =
IdentityManagerFactory::GetForBrowserState(browserState) IdentityManagerFactory::GetForBrowserState(browserState)
->GetPrimaryAccountInfo(); ->GetPrimaryAccountInfo();
......
...@@ -41,8 +41,7 @@ class Browser; ...@@ -41,8 +41,7 @@ class Browser;
dispatcher NS_DESIGNATED_INITIALIZER; dispatcher NS_DESIGNATED_INITIALIZER;
- (instancetype)initWithBaseViewController:(UIViewController*)viewController - (instancetype)initWithBaseViewController:(UIViewController*)viewController
browserState: browserState:(ChromeBrowserState*)browserState
(ios::ChromeBrowserState*)browserState
NS_UNAVAILABLE; NS_UNAVAILABLE;
// Creates a coordinator that uses |viewController| and |browser|. // Creates a coordinator that uses |viewController| and |browser|.
......
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