Commit 7c52d86a authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

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

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

Bug: 1042208
Change-Id: Iaf4eb9527cdb075ddf9074e6efd7dfd7213cb9c4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2014979
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarSergio Collazos <sczs@chromium.org>
Commit-Queue: Sergio Collazos <sczs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734581}
parent 052c0661
...@@ -56,7 +56,7 @@ const void* const kFullscreenDisablerKey = &kFullscreenDisablerKey; ...@@ -56,7 +56,7 @@ const void* const kFullscreenDisablerKey = &kFullscreenDisablerKey;
+ (instancetype)wrapperForCoordinator:(ChromeCoordinator*)coordinator { + (instancetype)wrapperForCoordinator:(ChromeCoordinator*)coordinator {
// ChromeCoordinators that need to disable fullscreen must be initialized with // ChromeCoordinators that need to disable fullscreen must be initialized with
// a ChromeBrowserState. // a ChromeBrowserState.
ios::ChromeBrowserState* browserState = coordinator.browserState; ChromeBrowserState* browserState = coordinator.browserState;
DCHECK(browserState); DCHECK(browserState);
// Fetch the associated wrapper. // Fetch the associated wrapper.
ScopedFullscreenDisablerWrapper* wrapper = ScopedFullscreenDisablerWrapper* wrapper =
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#include "base/macros.h" #include "base/macros.h"
#include "base/no_destructor.h" #include "base/no_destructor.h"
#include "components/keyed_service/ios/browser_state_keyed_service_factory.h" #include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
class ChromeBrowserState;
class FullscreenController; class FullscreenController;
// FullscreenControllerFactory attaches FullscreenControllers to // FullscreenControllerFactory attaches FullscreenControllers to
...@@ -19,7 +19,7 @@ class FullscreenControllerFactory : public BrowserStateKeyedServiceFactory { ...@@ -19,7 +19,7 @@ class FullscreenControllerFactory : public BrowserStateKeyedServiceFactory {
// Convenience getter that typecasts the value returned to a // Convenience getter that typecasts the value returned to a
// FullscreenController. // FullscreenController.
static FullscreenController* GetForBrowserState( static FullscreenController* GetForBrowserState(
ios::ChromeBrowserState* browser_state); ChromeBrowserState* browser_state);
// Getter for singleton instance. // Getter for singleton instance.
static FullscreenControllerFactory* GetInstance(); static FullscreenControllerFactory* GetInstance();
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
// static // static
FullscreenController* FullscreenControllerFactory::GetForBrowserState( FullscreenController* FullscreenControllerFactory::GetForBrowserState(
ios::ChromeBrowserState* browser_state) { ChromeBrowserState* browser_state) {
return static_cast<FullscreenController*>( return static_cast<FullscreenController*>(
GetInstance()->GetServiceForBrowserState(browser_state, true)); GetInstance()->GetServiceForBrowserState(browser_state, true));
} }
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
web::WebState* webState = chrome_test_util::GetCurrentWebState(); web::WebState* webState = chrome_test_util::GetCurrentWebState();
if (!webState) if (!webState)
return UIEdgeInsetsZero; return UIEdgeInsetsZero;
ios::ChromeBrowserState* browserState = ChromeBrowserState* browserState =
ios::ChromeBrowserState::FromBrowserState(webState->GetBrowserState()); ChromeBrowserState::FromBrowserState(webState->GetBrowserState());
FullscreenController* fullscreenController = FullscreenController* fullscreenController =
FullscreenControllerFactory::GetForBrowserState(browserState); FullscreenControllerFactory::GetForBrowserState(browserState);
if (!fullscreenController) if (!fullscreenController)
......
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