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

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

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

Bug: 1042208
Change-Id: I06b3d8fcec1b1b1604f9086b34e865049343badc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017367
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarDavid Jean <djean@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735882}
parent 9b14c2e1
...@@ -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 TextToSpeechPlaybackController; class TextToSpeechPlaybackController;
// TextToSpeechPlaybackControllerFactory attaches // TextToSpeechPlaybackControllerFactory attaches
...@@ -20,7 +20,7 @@ class TextToSpeechPlaybackControllerFactory ...@@ -20,7 +20,7 @@ class TextToSpeechPlaybackControllerFactory
// Convenience getter that typecasts the value returned to a // Convenience getter that typecasts the value returned to a
// TextToSpeechPlaybackController. // TextToSpeechPlaybackController.
static TextToSpeechPlaybackController* GetForBrowserState( static TextToSpeechPlaybackController* GetForBrowserState(
ios::ChromeBrowserState* browser_state); ChromeBrowserState* browser_state);
// Getter for singleton instance. // Getter for singleton instance.
static TextToSpeechPlaybackControllerFactory* GetInstance(); static TextToSpeechPlaybackControllerFactory* GetInstance();
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
// static // static
TextToSpeechPlaybackController* TextToSpeechPlaybackController*
TextToSpeechPlaybackControllerFactory::GetForBrowserState( TextToSpeechPlaybackControllerFactory::GetForBrowserState(
ios::ChromeBrowserState* browser_state) { ChromeBrowserState* browser_state) {
return static_cast<TextToSpeechPlaybackController*>( return static_cast<TextToSpeechPlaybackController*>(
GetInstance()->GetServiceForBrowserState(browser_state, true)); GetInstance()->GetServiceForBrowserState(browser_state, true));
} }
......
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