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

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

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

Bug: 1042208
Change-Id: I42300bde4027f3dcb3a75f707fe32dca6b87b53c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017407
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarMark Cogan <marq@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735298}
parent d6c77d69
...@@ -19,8 +19,7 @@ ...@@ -19,8 +19,7 @@
NS_UNAVAILABLE; NS_UNAVAILABLE;
// Unavailable, use -initWithBaseViewController:browser:. // Unavailable, use -initWithBaseViewController:browser:.
- (instancetype)initWithBaseViewController:(UIViewController*)viewController - (instancetype)initWithBaseViewController:(UIViewController*)viewController
browserState: browserState:(ChromeBrowserState*)browserState
(ios::ChromeBrowserState*)browserState
NS_UNAVAILABLE; NS_UNAVAILABLE;
@end @end
......
...@@ -18,8 +18,7 @@ ...@@ -18,8 +18,7 @@
// Use -initWithBaseViewController:browser: // Use -initWithBaseViewController:browser:
- (instancetype)initWithBaseViewController:(UIViewController*)viewController - (instancetype)initWithBaseViewController:(UIViewController*)viewController
browserState: browserState:(ChromeBrowserState*)browserState
(ios::ChromeBrowserState*)browserState
NS_UNAVAILABLE; NS_UNAVAILABLE;
//|originPoint| is the midpoint of the UI element from which the page info //|originPoint| is the midpoint of the UI element from which the page info
......
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