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

[ios] Fix uses of ios::ChromeBrowserState in...

[ios] Fix uses of ios::ChromeBrowserState in /ios/chrome/browser/ui/browser_view/browser_view_controller.h

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

Bug: 1042208
Change-Id: I93ed83ef713fb87dcf730a8a40c28a7df9428c1a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017523Reviewed-by: default avatarGauthier Ambard <gambard@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734957}
parent 45b2af30
...@@ -8,13 +8,13 @@ ...@@ -8,13 +8,13 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import "base/ios/block_types.h" #import "base/ios/block_types.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
#import "ios/chrome/browser/ui/page_info/requirements/page_info_presentation.h" #import "ios/chrome/browser/ui/page_info/requirements/page_info_presentation.h"
#import "ios/chrome/browser/ui/settings/sync/utils/sync_presenter.h" #import "ios/chrome/browser/ui/settings/sync/utils/sync_presenter.h"
#import "ios/chrome/browser/ui/toolbar/toolbar_coordinator_delegate.h" #import "ios/chrome/browser/ui/toolbar/toolbar_coordinator_delegate.h"
#import "ios/public/provider/chrome/browser/voice/logo_animation_controller.h" #import "ios/public/provider/chrome/browser/voice/logo_animation_controller.h"
class Browser; class Browser;
class ChromeBrowserState;
@protocol ApplicationCommands; @protocol ApplicationCommands;
@protocol BrowserCommands; @protocol BrowserCommands;
@protocol BrowsingDataCommands; @protocol BrowsingDataCommands;
...@@ -83,7 +83,7 @@ class Browser; ...@@ -83,7 +83,7 @@ class Browser;
@property(nonatomic, weak, readonly) TabModel* tabModel; @property(nonatomic, weak, readonly) TabModel* tabModel;
// The Browser's ChromeBrowserState. // The Browser's ChromeBrowserState.
@property(nonatomic, assign, readonly) ios::ChromeBrowserState* browserState; @property(nonatomic, assign, readonly) ChromeBrowserState* browserState;
// Whether the receiver is currently the primary BVC. // Whether the receiver is currently the primary BVC.
- (void)setPrimary:(BOOL)primary; - (void)setPrimary:(BOOL)primary;
......
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