| Index: chrome/browser/search/hotword_service_factory.h
|
| diff --git a/chrome/browser/search/hotword_service_factory.h b/chrome/browser/search/hotword_service_factory.h
|
| index 08d325f01d89f2cca0d56d60613ca13f1ad38450..348929678d6efc4836d6ab52391e7e01e9a3a848 100644
|
| --- a/chrome/browser/search/hotword_service_factory.h
|
| +++ b/chrome/browser/search/hotword_service_factory.h
|
| @@ -6,15 +6,13 @@
|
| #define CHROME_BROWSER_SEARCH_HOTWORD_SERVICE_FACTORY_H_
|
|
|
| #include "base/memory/singleton.h"
|
| -#include "chrome/browser/media/media_capture_devices_dispatcher.h"
|
| #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
|
|
|
| class HotwordService;
|
| class Profile;
|
|
|
| // Singleton that owns all HotwordServices and associates them with Profiles.
|
| -class HotwordServiceFactory : public MediaCaptureDevicesDispatcher::Observer,
|
| - public BrowserContextKeyedServiceFactory {
|
| +class HotwordServiceFactory : public BrowserContextKeyedServiceFactory {
|
| public:
|
| // Returns the HotwordService for |context|.
|
| static HotwordService* GetForProfile(content::BrowserContext* context);
|
| @@ -34,19 +32,6 @@ class HotwordServiceFactory : public MediaCaptureDevicesDispatcher::Observer,
|
| // A value of 0 indicates no error.
|
| static int GetCurrentError(content::BrowserContext* context);
|
|
|
| - // Returns the current known state of the microphone. Since this state
|
| - // is browser (not profile) specific, it resides in the factory.
|
| - static bool IsMicrophoneAvailable();
|
| -
|
| - // Returns whether the state of the audio devices has been updated.
|
| - // Essentially it indicates the validity of the return value from
|
| - // IsMicrophoneAvailable().
|
| - static bool IsAudioDeviceStateUpdated();
|
| -
|
| - // Overridden from MediaCaptureDevicesDispatcher::Observer
|
| - void OnUpdateAudioDevices(
|
| - const content::MediaStreamDevices& devices) override;
|
| -
|
| // This will kick off the monitor that calls OnUpdateAudioDevices when the
|
| // number of audio devices changes (or is initialized). It needs to be a
|
| // separate function so it can be called after the service is initialized
|
| @@ -67,21 +52,6 @@ class HotwordServiceFactory : public MediaCaptureDevicesDispatcher::Observer,
|
| KeyedService* BuildServiceInstanceFor(
|
| content::BrowserContext* context) const override;
|
|
|
| - // Must be called from the UI thread since the instance of
|
| - // MediaCaptureDevicesDispatcher can only be accessed on the UI thread.
|
| - void InitializeMicrophoneObserver();
|
| -
|
| - bool microphone_available() { return microphone_available_; }
|
| -
|
| - bool microphone_available_;
|
| -
|
| - // Indicates if the check for audio devices has been run such that it can be
|
| - // included in the error checking. Audio checking is not done immediately
|
| - // upon start up because of the negative impact on performance.
|
| - bool audio_device_state_updated_;
|
| -
|
| - bool audio_device_state_updated() { return audio_device_state_updated_; }
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(HotwordServiceFactory);
|
| };
|
|
|
|
|