| Index: chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h
|
| diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h
|
| index b73cb516d20af32b2c9ebdb3e32d1514afdf782f..efc2d98e07a74cd3dbb00552885eed23259a19d7 100644
|
| --- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h
|
| +++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h
|
| @@ -26,17 +26,16 @@ class WebrtcAudioPrivateEventService
|
| public base::SystemMonitor::DevicesChangedObserver {
|
| public:
|
| explicit WebrtcAudioPrivateEventService(content::BrowserContext* context);
|
| - virtual ~WebrtcAudioPrivateEventService();
|
| + ~WebrtcAudioPrivateEventService() override;
|
|
|
| // BrowserContextKeyedAPI implementation.
|
| - virtual void Shutdown() override;
|
| + void Shutdown() override;
|
| static BrowserContextKeyedAPIFactory<WebrtcAudioPrivateEventService>*
|
| GetFactoryInstance();
|
| static const char* service_name();
|
|
|
| // base::SystemMonitor::DevicesChangedObserver implementation.
|
| - virtual void OnDevicesChanged(
|
| - base::SystemMonitor::DeviceType device_type) override;
|
| + void OnDevicesChanged(base::SystemMonitor::DeviceType device_type) override;
|
|
|
| private:
|
| friend class BrowserContextKeyedAPIFactory<WebrtcAudioPrivateEventService>;
|
| @@ -51,7 +50,7 @@ class WebrtcAudioPrivateEventService
|
| class WebrtcAudioPrivateFunction : public ChromeAsyncExtensionFunction {
|
| protected:
|
| WebrtcAudioPrivateFunction();
|
| - virtual ~WebrtcAudioPrivateFunction();
|
| + ~WebrtcAudioPrivateFunction() override;
|
|
|
| protected:
|
| // Retrieves the list of output device names on the appropriate
|
| @@ -108,7 +107,7 @@ class WebrtcAudioPrivateFunction : public ChromeAsyncExtensionFunction {
|
|
|
| class WebrtcAudioPrivateGetSinksFunction : public WebrtcAudioPrivateFunction {
|
| protected:
|
| - virtual ~WebrtcAudioPrivateGetSinksFunction() {}
|
| + ~WebrtcAudioPrivateGetSinksFunction() override {}
|
|
|
| private:
|
| DECLARE_EXTENSION_FUNCTION("webrtcAudioPrivate.getSinks",
|
| @@ -117,9 +116,9 @@ class WebrtcAudioPrivateGetSinksFunction : public WebrtcAudioPrivateFunction {
|
| // Sequence of events is that we query the list of sinks on the
|
| // AudioManager's thread, then calculate HMACs on the IO thread,
|
| // then finish on the UI thread.
|
| - virtual bool RunAsync() override;
|
| + bool RunAsync() override;
|
| void DoQuery();
|
| - virtual void OnOutputDeviceNames(
|
| + void OnOutputDeviceNames(
|
| scoped_ptr<media::AudioDeviceNames> raw_ids) override;
|
| void DoneOnUIThread();
|
| };
|
| @@ -127,17 +126,17 @@ class WebrtcAudioPrivateGetSinksFunction : public WebrtcAudioPrivateFunction {
|
| class WebrtcAudioPrivateGetActiveSinkFunction
|
| : public WebrtcAudioPrivateFunction {
|
| protected:
|
| - virtual ~WebrtcAudioPrivateGetActiveSinkFunction() {}
|
| + ~WebrtcAudioPrivateGetActiveSinkFunction() override {}
|
|
|
| private:
|
| DECLARE_EXTENSION_FUNCTION("webrtcAudioPrivate.getActiveSink",
|
| WEBRTC_AUDIO_PRIVATE_GET_ACTIVE_SINK);
|
|
|
| - virtual bool RunAsync() override;
|
| - virtual void OnControllerList(
|
| - const content::RenderViewHost::AudioOutputControllerList&
|
| - controllers) override;
|
| - virtual void OnHMACCalculated(const std::string& hmac) override;
|
| + bool RunAsync() override;
|
| + void OnControllerList(
|
| + const content::RenderViewHost::AudioOutputControllerList& controllers)
|
| + override;
|
| + void OnHMACCalculated(const std::string& hmac) override;
|
| };
|
|
|
| class WebrtcAudioPrivateSetActiveSinkFunction
|
| @@ -146,17 +145,17 @@ class WebrtcAudioPrivateSetActiveSinkFunction
|
| WebrtcAudioPrivateSetActiveSinkFunction();
|
|
|
| protected:
|
| - virtual ~WebrtcAudioPrivateSetActiveSinkFunction();
|
| + ~WebrtcAudioPrivateSetActiveSinkFunction() override;
|
|
|
| private:
|
| DECLARE_EXTENSION_FUNCTION("webrtcAudioPrivate.setActiveSink",
|
| WEBRTC_AUDIO_PRIVATE_SET_ACTIVE_SINK);
|
|
|
| - virtual bool RunAsync() override;
|
| - virtual void OnControllerList(
|
| - const content::RenderViewHost::AudioOutputControllerList&
|
| - controllers) override;
|
| - virtual void OnOutputDeviceNames(
|
| + bool RunAsync() override;
|
| + void OnControllerList(
|
| + const content::RenderViewHost::AudioOutputControllerList& controllers)
|
| + override;
|
| + void OnOutputDeviceNames(
|
| scoped_ptr<media::AudioDeviceNames> device_names) override;
|
| void SwitchDone();
|
| void DoneOnUIThread();
|
| @@ -178,13 +177,13 @@ class WebrtcAudioPrivateGetAssociatedSinkFunction
|
| WebrtcAudioPrivateGetAssociatedSinkFunction();
|
|
|
| protected:
|
| - virtual ~WebrtcAudioPrivateGetAssociatedSinkFunction();
|
| + ~WebrtcAudioPrivateGetAssociatedSinkFunction() override;
|
|
|
| private:
|
| DECLARE_EXTENSION_FUNCTION("webrtcAudioPrivate.getAssociatedSink",
|
| WEBRTC_AUDIO_PRIVATE_GET_ASSOCIATED_SINK);
|
|
|
| - virtual bool RunAsync() override;
|
| + bool RunAsync() override;
|
|
|
| // This implementation is slightly complicated because of different
|
| // thread requirements for the various functions we need to invoke.
|
| @@ -215,7 +214,7 @@ class WebrtcAudioPrivateGetAssociatedSinkFunction
|
| void GetAssociatedSinkOnDeviceThread(const std::string& raw_source_id);
|
|
|
| // Receives the associated sink ID after its HMAC is calculated.
|
| - virtual void OnHMACCalculated(const std::string& hmac) override;
|
| + void OnHMACCalculated(const std::string& hmac) override;
|
|
|
| // Accessed from UI thread and device thread, but only on one at a
|
| // time, no locking needed.
|
|
|