Commit 93007b45 authored by Mike Dougherty's avatar Mike Dougherty Committed by Commit Bot

Revert "[ios] Plumb Browser to VoiceSearchController"

This reverts commit 9ac29612.

Reason for revert: Breaks downstream build.

Original change's description:
> [ios] Plumb Browser to VoiceSearchController
> 
> VoiceSearchCoordinator needs a Browser to access a Browser-scoped
> FullscreenController.
> 
> Bug: 790886
> Change-Id: I24acae364cb64ecc011375045feab66e58dd432e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2132852
> Commit-Queue: Chris Lu <thegreenfrog@chromium.org>
> Reviewed-by: Mark Cogan <marq@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#756754}

TBR=marq@chromium.org,thegreenfrog@chromium.org

Change-Id: I6ad6ae1d99efd9915ecb19cfcdd572f1d46b9d76
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 790886
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2138252Reviewed-by: default avatarMike Dougherty <michaeldo@chromium.org>
Commit-Queue: Mike Dougherty <michaeldo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756792}
parent 772faacf
...@@ -2704,7 +2704,7 @@ NSString* const kBrowserViewControllerSnackbarCategory = ...@@ -2704,7 +2704,7 @@ NSString* const kBrowserViewControllerSnackbarCategory =
ios::GetChromeBrowserProvider()->GetVoiceSearchProvider(); ios::GetChromeBrowserProvider()->GetVoiceSearchProvider();
if (provider) { if (provider) {
_voiceSearchController = _voiceSearchController =
provider->CreateVoiceSearchController(self.browser); provider->CreateVoiceSearchController(self.browserState);
if (self.primaryToolbarCoordinator) { if (self.primaryToolbarCoordinator) {
_voiceSearchController->SetDispatcher( _voiceSearchController->SetDispatcher(
static_cast<id<LoadQueryCommands>>(self.commandDispatcher)); static_cast<id<LoadQueryCommands>>(self.commandDispatcher));
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
@protocol ApplicationCommands; @protocol ApplicationCommands;
class AudioSessionController; class AudioSessionController;
class Browser; class ChromeBrowserState;
class VoiceSearchController; class VoiceSearchController;
// VoiceSearchProvider allows embedders to provide functionality related to // VoiceSearchProvider allows embedders to provide functionality related to
...@@ -35,7 +35,7 @@ class VoiceSearchProvider { ...@@ -35,7 +35,7 @@ class VoiceSearchProvider {
// Creates a new VoiceSearchController object. // Creates a new VoiceSearchController object.
virtual scoped_refptr<VoiceSearchController> CreateVoiceSearchController( virtual scoped_refptr<VoiceSearchController> CreateVoiceSearchController(
Browser* browser) const; ChromeBrowserState* browser_state) const;
private: private:
DISALLOW_COPY_AND_ASSIGN(VoiceSearchProvider); DISALLOW_COPY_AND_ASSIGN(VoiceSearchProvider);
......
...@@ -23,6 +23,7 @@ AudioSessionController* VoiceSearchProvider::GetAudioSessionController() const { ...@@ -23,6 +23,7 @@ AudioSessionController* VoiceSearchProvider::GetAudioSessionController() const {
} }
scoped_refptr<VoiceSearchController> scoped_refptr<VoiceSearchController>
VoiceSearchProvider::CreateVoiceSearchController(Browser* browser) const { VoiceSearchProvider::CreateVoiceSearchController(
ChromeBrowserState* browser_state) const {
return scoped_refptr<VoiceSearchController>(nullptr); return scoped_refptr<VoiceSearchController>(nullptr);
} }
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