Commit 990b5c10 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

[ios] Fix uses of ios::ChromeBrowserState in /ios/chrome/app/application_delegate

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: I84a18e74598f0cdabaa1b04a4953cc49903e060e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017511
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@{#734993}
parent 952b39c0
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#include "base/ios/block_types.h" #include "base/ios/block_types.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
class ChromeBrowserState;
@class SettingsNavigationController; @class SettingsNavigationController;
// Handles the navigation through the application. // Handles the navigation through the application.
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
// Presents a SignedInAccountsViewController for |browserState| on the top view // Presents a SignedInAccountsViewController for |browserState| on the top view
// controller. // controller.
- (void)presentSignedInAccountsViewControllerForBrowserState: - (void)presentSignedInAccountsViewControllerForBrowserState:
(ios::ChromeBrowserState*)browserState; (ChromeBrowserState*)browserState;
// Closes the settings UI with or without animation, with an optional // Closes the settings UI with or without animation, with an optional
// completion block. // completion block.
......
...@@ -172,7 +172,7 @@ initWithBrowserLauncher:(id<BrowserLauncher>)browserLauncher ...@@ -172,7 +172,7 @@ initWithBrowserLauncher:(id<BrowserLauncher>)browserLauncher
} }
_applicationInBackground = YES; _applicationInBackground = YES;
ios::ChromeBrowserState* browserState = ChromeBrowserState* browserState =
_browserLauncher.interfaceProvider.mainInterface.browserState; _browserLauncher.interfaceProvider.mainInterface.browserState;
if (browserState) { if (browserState) {
AuthenticationServiceFactory::GetForBrowserState(browserState) AuthenticationServiceFactory::GetForBrowserState(browserState)
...@@ -284,7 +284,7 @@ initWithBrowserLauncher:(id<BrowserLauncher>)browserLauncher ...@@ -284,7 +284,7 @@ initWithBrowserLauncher:(id<BrowserLauncher>)browserLauncher
return; return;
_applicationInBackground = NO; _applicationInBackground = NO;
ios::ChromeBrowserState* browserState = ChromeBrowserState* browserState =
_browserLauncher.interfaceProvider.mainInterface.browserState; _browserLauncher.interfaceProvider.mainInterface.browserState;
if (browserState) { if (browserState) {
AuthenticationServiceFactory::GetForBrowserState(browserState) AuthenticationServiceFactory::GetForBrowserState(browserState)
...@@ -311,7 +311,7 @@ initWithBrowserLauncher:(id<BrowserLauncher>)browserLauncher ...@@ -311,7 +311,7 @@ initWithBrowserLauncher:(id<BrowserLauncher>)browserLauncher
.interfaceProvider]; .interfaceProvider];
[memoryHelper resetForegroundMemoryWarningCount]; [memoryHelper resetForegroundMemoryWarningCount];
ios::ChromeBrowserState* currentBrowserState = ChromeBrowserState* currentBrowserState =
_browserLauncher.interfaceProvider.currentInterface.browserState; _browserLauncher.interfaceProvider.currentInterface.browserState;
if ([SignedInAccountsViewController if ([SignedInAccountsViewController
shouldBePresentedForBrowserState:currentBrowserState]) { shouldBePresentedForBrowserState:currentBrowserState]) {
...@@ -320,7 +320,7 @@ initWithBrowserLauncher:(id<BrowserLauncher>)browserLauncher ...@@ -320,7 +320,7 @@ initWithBrowserLauncher:(id<BrowserLauncher>)browserLauncher
} }
// Use the mainBVC as the ContentSuggestions can only be started in non-OTR. // Use the mainBVC as the ContentSuggestions can only be started in non-OTR.
ios::ChromeBrowserState* mainBrowserState = ChromeBrowserState* mainBrowserState =
_browserLauncher.interfaceProvider.mainInterface.browserState; _browserLauncher.interfaceProvider.mainInterface.browserState;
[ContentSuggestionsSchedulerNotifications notifyForeground:mainBrowserState]; [ContentSuggestionsSchedulerNotifications notifyForeground:mainBrowserState];
......
...@@ -320,7 +320,7 @@ class AppStateTest : public BlockCleanupTest { ...@@ -320,7 +320,7 @@ class AppStateTest : public BlockCleanupTest {
StubBrowserInterfaceProvider* getInterfaceProvider() { StubBrowserInterfaceProvider* getInterfaceProvider() {
return interface_provider_; return interface_provider_;
} }
ios::ChromeBrowserState* getBrowserState() { return browser_state_.get(); } ChromeBrowserState* getBrowserState() { return browser_state_.get(); }
BOOL metricsMediatorHasBeenCalled() { return metrics_mediator_called_; } BOOL metricsMediatorHasBeenCalled() { return metrics_mediator_called_; }
......
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