Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(421)

Unified Diff: content/renderer/pepper/pepper_media_device_manager.h

Issue 670683003: Standardize usage of virtual/override/final in content/renderer/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/pepper/pepper_media_device_manager.h
diff --git a/content/renderer/pepper/pepper_media_device_manager.h b/content/renderer/pepper/pepper_media_device_manager.h
index d141cf378770da2e1da426f70fac05bf28534fa3..6fd8ded682c683311f8b0192cb77f2f8d94e682d 100644
--- a/content/renderer/pepper/pepper_media_device_manager.h
+++ b/content/renderer/pepper/pepper_media_device_manager.h
@@ -25,14 +25,13 @@ class PepperMediaDeviceManager
public:
static base::WeakPtr<PepperMediaDeviceManager> GetForRenderFrame(
RenderFrame* render_frame);
- virtual ~PepperMediaDeviceManager();
+ ~PepperMediaDeviceManager() override;
// PepperDeviceEnumerationHostHelper::Delegate implementation:
- virtual int EnumerateDevices(PP_DeviceType_Dev type,
- const GURL& document_url,
- const EnumerateDevicesCallback& callback)
- override;
- virtual void StopEnumerateDevices(int request_id) override;
+ int EnumerateDevices(PP_DeviceType_Dev type,
+ const GURL& document_url,
+ const EnumerateDevicesCallback& callback) override;
+ void StopEnumerateDevices(int request_id) override;
typedef base::Callback<void(int /* request_id */,
bool /* succeeded */,
@@ -56,23 +55,22 @@ class PepperMediaDeviceManager
int GetSessionID(PP_DeviceType_Dev type, const std::string& label);
// MediaStreamDispatcherEventHandler implementation.
- virtual void OnStreamGenerated(
+ void OnStreamGenerated(
int request_id,
const std::string& label,
const StreamDeviceInfoArray& audio_device_array,
const StreamDeviceInfoArray& video_device_array) override;
- virtual void OnStreamGenerationFailed(
+ void OnStreamGenerationFailed(
int request_id,
content::MediaStreamRequestResult result) override;
- virtual void OnDeviceStopped(const std::string& label,
- const StreamDeviceInfo& device_info) override;
- virtual void OnDevicesEnumerated(int request_id,
- const StreamDeviceInfoArray& device_array)
- override;
- virtual void OnDeviceOpened(int request_id,
- const std::string& label,
- const StreamDeviceInfo& device_info) override;
- virtual void OnDeviceOpenFailed(int request_id) override;
+ void OnDeviceStopped(const std::string& label,
+ const StreamDeviceInfo& device_info) override;
+ void OnDevicesEnumerated(int request_id,
+ const StreamDeviceInfoArray& device_array) override;
+ void OnDeviceOpened(int request_id,
+ const std::string& label,
+ const StreamDeviceInfo& device_info) override;
+ void OnDeviceOpenFailed(int request_id) override;
// Stream type conversion.
static MediaStreamType FromPepperDeviceType(PP_DeviceType_Dev type);
« no previous file with comments | « content/renderer/pepper/pepper_in_process_router.cc ('k') | content/renderer/pepper/pepper_media_stream_audio_track_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698