diff options
| author | mohan.reddy <mohan.reddy@samsung.com> | 2014-10-07 21:53:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-08 04:53:33 +0000 |
| commit | ee0b42adc4bab82e4fd2df62f9894e4c1ed38b4a (patch) | |
| tree | 132b89ec2cf0bd22f1ff3b5597ca13e4b96250d1 /content/renderer | |
| parent | 907476a587e42b8865d7e6320f373d9fcca48816 (diff) | |
| download | chromium_src-ee0b42adc4bab82e4fd2df62f9894e4c1ed38b4a.zip chromium_src-ee0b42adc4bab82e4fd2df62f9894e4c1ed38b4a.tar.gz chromium_src-ee0b42adc4bab82e4fd2df62f9894e4c1ed38b4a.tar.bz2 | |
Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer
This step is a giant search and replace for OVERRIDE and FINAL to
replace them with their lowercase versions.
BUG=417463
Review URL: https://codereview.chromium.org/633303002
Cr-Commit-Position: refs/heads/master@{#298655}
Diffstat (limited to 'content/renderer')
278 files changed, 1666 insertions, 1666 deletions
diff --git a/content/renderer/accessibility/blink_ax_tree_source.h b/content/renderer/accessibility/blink_ax_tree_source.h index b252b27..f09ebdc 100644 --- a/content/renderer/accessibility/blink_ax_tree_source.h +++ b/content/renderer/accessibility/blink_ax_tree_source.h @@ -30,20 +30,20 @@ class BlinkAXTreeSource bool IsInTree(blink::WebAXObject node) const; // AXTreeSource implementation. - virtual blink::WebAXObject GetRoot() const OVERRIDE; - virtual blink::WebAXObject GetFromId(int32 id) const OVERRIDE; - virtual int32 GetId(blink::WebAXObject node) const OVERRIDE; + virtual blink::WebAXObject GetRoot() const override; + virtual blink::WebAXObject GetFromId(int32 id) const override; + virtual int32 GetId(blink::WebAXObject node) const override; virtual void GetChildren( blink::WebAXObject node, - std::vector<blink::WebAXObject>* out_children) const OVERRIDE; + std::vector<blink::WebAXObject>* out_children) const override; virtual blink::WebAXObject GetParent(blink::WebAXObject node) const - OVERRIDE; + override; virtual void SerializeNode(blink::WebAXObject node, - ui::AXNodeData* out_data) const OVERRIDE; - virtual bool IsValid(blink::WebAXObject node) const OVERRIDE; + ui::AXNodeData* out_data) const override; + virtual bool IsValid(blink::WebAXObject node) const override; virtual bool IsEqual(blink::WebAXObject node1, - blink::WebAXObject node2) const OVERRIDE; - virtual blink::WebAXObject GetNull() const OVERRIDE; + blink::WebAXObject node2) const override; + virtual blink::WebAXObject GetNull() const override; blink::WebDocument GetMainDocument() const; diff --git a/content/renderer/accessibility/renderer_accessibility_complete.h b/content/renderer/accessibility/renderer_accessibility_complete.h index 63c0d7e..6158dd0 100644 --- a/content/renderer/accessibility/renderer_accessibility_complete.h +++ b/content/renderer/accessibility/renderer_accessibility_complete.h @@ -41,13 +41,13 @@ class CONTENT_EXPORT RendererAccessibilityComplete virtual ~RendererAccessibilityComplete(); // RenderFrameObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // RendererAccessibility. virtual void HandleWebAccessibilityEvent( - const blink::WebAXObject& obj, blink::WebAXEvent event) OVERRIDE; - virtual RendererAccessibilityType GetType() OVERRIDE; - virtual void FocusedNodeChanged(const blink::WebNode& node) OVERRIDE; + const blink::WebAXObject& obj, blink::WebAXEvent event) override; + virtual RendererAccessibilityType GetType() override; + virtual void FocusedNodeChanged(const blink::WebNode& node) override; void HandleAXEvent(const blink::WebAXObject& obj, ui::AXEvent event); diff --git a/content/renderer/accessibility/renderer_accessibility_focus_only.h b/content/renderer/accessibility/renderer_accessibility_focus_only.h index 5306808..df42303 100644 --- a/content/renderer/accessibility/renderer_accessibility_focus_only.h +++ b/content/renderer/accessibility/renderer_accessibility_focus_only.h @@ -54,12 +54,12 @@ class RendererAccessibilityFocusOnly : public RendererAccessibility { // RendererAccessibility implementation. virtual void HandleWebAccessibilityEvent( - const blink::WebAXObject& obj, blink::WebAXEvent event) OVERRIDE; - virtual RendererAccessibilityType GetType() OVERRIDE; - virtual void FocusedNodeChanged(const blink::WebNode& node) OVERRIDE; + const blink::WebAXObject& obj, blink::WebAXEvent event) override; + virtual RendererAccessibilityType GetType() override; + virtual void FocusedNodeChanged(const blink::WebNode& node) override; // RenderFrameObserver implementation. - virtual void DidFinishLoad() OVERRIDE; + virtual void DidFinishLoad() override; private: void HandleFocusedNodeChanged(const blink::WebNode& node, diff --git a/content/renderer/android/address_detector.h b/content/renderer/android/address_detector.h index eea777f..e612339 100644 --- a/content/renderer/android/address_detector.h +++ b/content/renderer/android/address_detector.h @@ -23,9 +23,9 @@ class AddressDetector : public ContentDetector { const base::string16::const_iterator& end, size_t* start_pos, size_t* end_pos, - std::string* content_text) OVERRIDE; - virtual GURL GetIntentURL(const std::string& content_text) OVERRIDE; - virtual size_t GetMaximumContentLength() OVERRIDE; + std::string* content_text) override; + virtual GURL GetIntentURL(const std::string& content_text) override; + virtual size_t GetMaximumContentLength() override; std::string GetContentText(const base::string16& text); diff --git a/content/renderer/android/email_detector.h b/content/renderer/android/email_detector.h index ff469e8..97b35c7 100644 --- a/content/renderer/android/email_detector.h +++ b/content/renderer/android/email_detector.h @@ -27,9 +27,9 @@ class CONTENT_EXPORT EmailDetector : public ContentDetector { const base::string16::const_iterator& end, size_t* start_pos, size_t* end_pos, - std::string* content_text) OVERRIDE; - virtual GURL GetIntentURL(const std::string& content_text) OVERRIDE; - virtual size_t GetMaximumContentLength() OVERRIDE; + std::string* content_text) override; + virtual GURL GetIntentURL(const std::string& content_text) override; + virtual size_t GetMaximumContentLength() override; DISALLOW_COPY_AND_ASSIGN(EmailDetector); }; diff --git a/content/renderer/android/phone_number_detector.h b/content/renderer/android/phone_number_detector.h index 081a427..3741315 100644 --- a/content/renderer/android/phone_number_detector.h +++ b/content/renderer/android/phone_number_detector.h @@ -28,9 +28,9 @@ class CONTENT_EXPORT PhoneNumberDetector : public ContentDetector { const base::string16::const_iterator& end, size_t* start_pos, size_t* end_pos, - std::string* content_text) OVERRIDE; - virtual GURL GetIntentURL(const std::string& content_text) OVERRIDE; - virtual size_t GetMaximumContentLength() OVERRIDE; + std::string* content_text) override; + virtual GURL GetIntentURL(const std::string& content_text) override; + virtual size_t GetMaximumContentLength() override; const std::string region_code_; diff --git a/content/renderer/android/renderer_date_time_picker.h b/content/renderer/android/renderer_date_time_picker.h index b0bdb50..481d288c 100644 --- a/content/renderer/android/renderer_date_time_picker.h +++ b/content/renderer/android/renderer_date_time_picker.h @@ -33,7 +33,7 @@ class RendererDateTimePicker : public RenderViewObserver { void OnCancel(); // RenderViewObserver - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; blink::WebDateTimeChooserParams chooser_params_; blink::WebDateTimeChooserCompletion* chooser_completion_; // Not owned by us diff --git a/content/renderer/battery_status/battery_status_dispatcher.h b/content/renderer/battery_status/battery_status_dispatcher.h index 57255c0..38240bc 100644 --- a/content/renderer/battery_status/battery_status_dispatcher.h +++ b/content/renderer/battery_status/battery_status_dispatcher.h @@ -23,13 +23,13 @@ class CONTENT_EXPORT BatteryStatusDispatcher virtual ~BatteryStatusDispatcher(); // PlatformEventObserver public methods. - virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void SendFakeDataForTesting(void* data) OVERRIDE; + virtual bool OnControlMessageReceived(const IPC::Message& message) override; + virtual void SendFakeDataForTesting(void* data) override; protected: // PlatformEventObserver protected methods. - virtual void SendStartMessage() OVERRIDE; - virtual void SendStopMessage() OVERRIDE; + virtual void SendStartMessage() override; + virtual void SendStopMessage() override; private: void OnDidChange(const blink::WebBatteryStatus& status); diff --git a/content/renderer/battery_status/battery_status_dispatcher_unittest.cc b/content/renderer/battery_status/battery_status_dispatcher_unittest.cc index dd0bed6..31d2c66 100644 --- a/content/renderer/battery_status/battery_status_dispatcher_unittest.cc +++ b/content/renderer/battery_status/battery_status_dispatcher_unittest.cc @@ -21,7 +21,7 @@ class MockBatteryStatusListener : public blink::WebBatteryStatusListener { // blink::WebBatteryStatusListener method. virtual void updateBatteryStatus( - const blink::WebBatteryStatus& status) OVERRIDE { + const blink::WebBatteryStatus& status) override { status_ = status; did_change_battery_status_ = true; } diff --git a/content/renderer/bmp_image_decoder_unittest.cc b/content/renderer/bmp_image_decoder_unittest.cc index a249126..e509d58 100644 --- a/content/renderer/bmp_image_decoder_unittest.cc +++ b/content/renderer/bmp_image_decoder_unittest.cc @@ -10,7 +10,7 @@ class BMPImageDecoderTest : public ImageDecoderTest { BMPImageDecoderTest() : ImageDecoderTest("bmp") { } protected: - virtual blink::WebImageDecoder* CreateWebKitImageDecoder() const OVERRIDE { + virtual blink::WebImageDecoder* CreateWebKitImageDecoder() const override { return new blink::WebImageDecoder(blink::WebImageDecoder::TypeBMP); } diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h index b25f559..667b291 100644 --- a/content/renderer/browser_plugin/browser_plugin.h +++ b/content/renderer/browser_plugin/browser_plugin.h @@ -77,62 +77,62 @@ class CONTENT_EXPORT BrowserPlugin : static bool ShouldForwardToBrowserPlugin(const IPC::Message& message); // blink::WebPlugin implementation. - virtual blink::WebPluginContainer* container() const OVERRIDE; - virtual bool initialize(blink::WebPluginContainer* container) OVERRIDE; - virtual void destroy() OVERRIDE; - virtual bool supportsKeyboardFocus() const OVERRIDE; - virtual bool supportsEditCommands() const OVERRIDE; - virtual bool supportsInputMethod() const OVERRIDE; - virtual bool canProcessDrag() const OVERRIDE; + virtual blink::WebPluginContainer* container() const override; + virtual bool initialize(blink::WebPluginContainer* container) override; + virtual void destroy() override; + virtual bool supportsKeyboardFocus() const override; + virtual bool supportsEditCommands() const override; + virtual bool supportsInputMethod() const override; + virtual bool canProcessDrag() const override; virtual void paint( blink::WebCanvas* canvas, - const blink::WebRect& rect) OVERRIDE; + const blink::WebRect& rect) override; virtual void updateGeometry( const blink::WebRect& frame_rect, const blink::WebRect& clip_rect, const blink::WebVector<blink::WebRect>& cut_outs_rects, - bool is_visible) OVERRIDE; - virtual void updateFocus(bool focused) OVERRIDE; - virtual void updateVisibility(bool visible) OVERRIDE; - virtual bool acceptsInputEvents() OVERRIDE; + bool is_visible) override; + virtual void updateFocus(bool focused) override; + virtual void updateVisibility(bool visible) override; + virtual bool acceptsInputEvents() override; virtual bool handleInputEvent( const blink::WebInputEvent& event, - blink::WebCursorInfo& cursor_info) OVERRIDE; + blink::WebCursorInfo& cursor_info) override; virtual bool handleDragStatusUpdate(blink::WebDragStatus drag_status, const blink::WebDragData& drag_data, blink::WebDragOperationsMask mask, const blink::WebPoint& position, - const blink::WebPoint& screen) OVERRIDE; + const blink::WebPoint& screen) override; virtual void didReceiveResponse( - const blink::WebURLResponse& response) OVERRIDE; - virtual void didReceiveData(const char* data, int data_length) OVERRIDE; - virtual void didFinishLoading() OVERRIDE; - virtual void didFailLoading(const blink::WebURLError& error) OVERRIDE; + const blink::WebURLResponse& response) override; + virtual void didReceiveData(const char* data, int data_length) override; + virtual void didFinishLoading() override; + virtual void didFailLoading(const blink::WebURLError& error) override; virtual void didFinishLoadingFrameRequest( const blink::WebURL& url, - void* notify_data) OVERRIDE; + void* notify_data) override; virtual void didFailLoadingFrameRequest( const blink::WebURL& url, void* notify_data, - const blink::WebURLError& error) OVERRIDE; - virtual bool executeEditCommand(const blink::WebString& name) OVERRIDE; + const blink::WebURLError& error) override; + virtual bool executeEditCommand(const blink::WebString& name) override; virtual bool executeEditCommand(const blink::WebString& name, - const blink::WebString& value) OVERRIDE; + const blink::WebString& value) override; virtual bool setComposition( const blink::WebString& text, const blink::WebVector<blink::WebCompositionUnderline>& underlines, int selectionStart, - int selectionEnd) OVERRIDE; + int selectionEnd) override; virtual bool confirmComposition( const blink::WebString& text, - blink::WebWidget::ConfirmCompositionBehavior selectionBehavior) OVERRIDE; - virtual void extendSelectionAndDelete(int before, int after) OVERRIDE; + blink::WebWidget::ConfirmCompositionBehavior selectionBehavior) override; + virtual void extendSelectionAndDelete(int before, int after) override; // MouseLockDispatcher::LockTarget implementation. - virtual void OnLockMouseACK(bool succeeded) OVERRIDE; - virtual void OnMouseLockLost() OVERRIDE; + virtual void OnLockMouseACK(bool succeeded) override; + virtual void OnMouseLockLost() override; virtual bool HandleMouseLockedInputEvent( - const blink::WebMouseEvent& event) OVERRIDE; + const blink::WebMouseEvent& event) override; private: friend class base::DeleteHelper<BrowserPlugin>; diff --git a/content/renderer/browser_plugin/browser_plugin_manager.h b/content/renderer/browser_plugin/browser_plugin_manager.h index c87c241..3793ae6 100644 --- a/content/renderer/browser_plugin/browser_plugin_manager.h +++ b/content/renderer/browser_plugin/browser_plugin_manager.h @@ -54,15 +54,15 @@ class CONTENT_EXPORT BrowserPluginManager int GetNextInstanceID(); // RenderViewObserver override. Call on render thread. - virtual void DidCommitCompositorFrame() OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual bool Send(IPC::Message* msg) OVERRIDE; + virtual void DidCommitCompositorFrame() override; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual bool Send(IPC::Message* msg) override; // Don't destroy the BrowserPluginManager when the RenderViewImpl goes away. // BrowserPluginManager's lifetime is managed by a reference count. Once // the host RenderViewImpl and all BrowserPlugins release their references, // then the BrowserPluginManager will be destroyed. - virtual void OnDestruct() OVERRIDE {} + virtual void OnDestruct() override {} protected: // Friend RefCounted so that the dtor can be non-public. diff --git a/content/renderer/browser_render_view_browsertest.cc b/content/renderer/browser_render_view_browsertest.cc index 1172d02..bfeeb72e 100644 --- a/content/renderer/browser_render_view_browsertest.cc +++ b/content/renderer/browser_render_view_browsertest.cc @@ -55,7 +55,7 @@ class TestShellContentRendererClient : public ShellContentRendererClient { const blink::WebURLRequest& failed_request, const blink::WebURLError& error, std::string* error_html, - base::string16* error_description) OVERRIDE { + base::string16* error_description) override { if (error_html) *error_html = "A suffusion of yellow."; latest_error_valid_ = true; @@ -139,13 +139,13 @@ class RenderViewBrowserTest : public ContentBrowserTest { public: RenderViewBrowserTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // This method is needed to allow interaction with in-process renderer // and use of a test ContentRendererClient. command_line->AppendSwitch(switches::kSingleProcess); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { // Override setting of renderer client. renderer_client_ = new TestShellContentRendererClient(); // Explicitly leaks ownership; this object will remain alive diff --git a/content/renderer/child_frame_compositing_helper.h b/content/renderer/child_frame_compositing_helper.h index 4ebfd59..aca87db 100644 --- a/content/renderer/child_frame_compositing_helper.h +++ b/content/renderer/child_frame_compositing_helper.h @@ -74,7 +74,7 @@ class CONTENT_EXPORT ChildFrameCompositingHelper void ChildFrameGone(); // cc::DelegatedFrameProviderClient implementation. - virtual void UnusedResourcesAreAvailable() OVERRIDE; + virtual void UnusedResourcesAreAvailable() override; void SetContentsOpaque(bool); protected: diff --git a/content/renderer/device_sensors/device_light_event_pump.h b/content/renderer/device_sensors/device_light_event_pump.h index 6acd729..46766ec 100644 --- a/content/renderer/device_sensors/device_light_event_pump.h +++ b/content/renderer/device_sensors/device_light_event_pump.h @@ -30,17 +30,17 @@ class CONTENT_EXPORT DeviceLightEventPump bool SetListener(blink::WebDeviceLightListener* listener); // PlatformEventObserver implementation. - virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void SendFakeDataForTesting(void* data) OVERRIDE; + virtual bool OnControlMessageReceived(const IPC::Message& message) override; + virtual void SendFakeDataForTesting(void* data) override; protected: // Methods overriden from base class DeviceSensorEventPump - virtual void FireEvent() OVERRIDE; - virtual bool InitializeReader(base::SharedMemoryHandle handle) OVERRIDE; + virtual void FireEvent() override; + virtual bool InitializeReader(base::SharedMemoryHandle handle) override; // PlatformEventObserver implementation. - virtual void SendStartMessage() OVERRIDE; - virtual void SendStopMessage() OVERRIDE; + virtual void SendStartMessage() override; + virtual void SendStopMessage() override; private: bool ShouldFireEvent(double data) const; diff --git a/content/renderer/device_sensors/device_light_event_pump_unittest.cc b/content/renderer/device_sensors/device_light_event_pump_unittest.cc index b1d567c..f6eec3d 100644 --- a/content/renderer/device_sensors/device_light_event_pump_unittest.cc +++ b/content/renderer/device_sensors/device_light_event_pump_unittest.cc @@ -17,7 +17,7 @@ class MockDeviceLightListener : public blink::WebDeviceLightListener { MockDeviceLightListener() : did_change_device_light_(false) {} virtual ~MockDeviceLightListener() {} - virtual void didChangeDeviceLight(double value) OVERRIDE { + virtual void didChangeDeviceLight(double value) override { data_.value = value; did_change_device_light_ = true; } @@ -46,9 +46,9 @@ class DeviceLightEventPumpForTesting : public DeviceLightEventPump { void OnDidStart(base::SharedMemoryHandle renderer_handle) { DeviceLightEventPump::OnDidStart(renderer_handle); } - virtual void SendStartMessage() OVERRIDE { } - virtual void SendStopMessage() OVERRIDE { } - virtual void FireEvent() OVERRIDE { + virtual void SendStartMessage() override { } + virtual void SendStopMessage() override { } + virtual void FireEvent() override { DeviceLightEventPump::FireEvent(); Stop(); base::MessageLoop::current()->QuitWhenIdle(); @@ -66,7 +66,7 @@ class DeviceLightEventPumpTest : public testing::Test { } protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { const DeviceLightHardwareBuffer* null_buffer = NULL; listener_.reset(new MockDeviceLightListener); light_pump_.reset(new DeviceLightEventPumpForTesting); diff --git a/content/renderer/device_sensors/device_motion_event_pump.h b/content/renderer/device_sensors/device_motion_event_pump.h index 97339d4..37d4262 100644 --- a/content/renderer/device_sensors/device_motion_event_pump.h +++ b/content/renderer/device_sensors/device_motion_event_pump.h @@ -26,16 +26,16 @@ class CONTENT_EXPORT DeviceMotionEventPump virtual ~DeviceMotionEventPump(); // // PlatformEventObserver. - virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void SendFakeDataForTesting(void* fake_data) OVERRIDE; + virtual bool OnControlMessageReceived(const IPC::Message& message) override; + virtual void SendFakeDataForTesting(void* fake_data) override; protected: - virtual void FireEvent() OVERRIDE; - virtual bool InitializeReader(base::SharedMemoryHandle handle) OVERRIDE; + virtual void FireEvent() override; + virtual bool InitializeReader(base::SharedMemoryHandle handle) override; // PlatformEventObserver. - virtual void SendStartMessage() OVERRIDE; - virtual void SendStopMessage() OVERRIDE; + virtual void SendStartMessage() override; + virtual void SendStopMessage() override; scoped_ptr<DeviceMotionSharedMemoryReader> reader_; diff --git a/content/renderer/device_sensors/device_motion_event_pump_unittest.cc b/content/renderer/device_sensors/device_motion_event_pump_unittest.cc index 038870b9..c008cdc 100644 --- a/content/renderer/device_sensors/device_motion_event_pump_unittest.cc +++ b/content/renderer/device_sensors/device_motion_event_pump_unittest.cc @@ -22,7 +22,7 @@ class MockDeviceMotionListener : public blink::WebDeviceMotionListener { virtual ~MockDeviceMotionListener() { } virtual void didChangeDeviceMotion( - const blink::WebDeviceMotionData& data) OVERRIDE { + const blink::WebDeviceMotionData& data) override { memcpy(&data_, &data, sizeof(data)); did_change_device_motion_ = true; } @@ -50,9 +50,9 @@ class DeviceMotionEventPumpForTesting : public DeviceMotionEventPump { void OnDidStart(base::SharedMemoryHandle renderer_handle) { DeviceMotionEventPump::OnDidStart(renderer_handle); } - virtual void SendStartMessage() OVERRIDE { } - virtual void SendStopMessage() OVERRIDE { } - virtual void FireEvent() OVERRIDE { + virtual void SendStartMessage() override { } + virtual void SendStopMessage() override { } + virtual void FireEvent() override { DeviceMotionEventPump::FireEvent(); Stop(); base::MessageLoop::current()->QuitWhenIdle(); @@ -70,7 +70,7 @@ class DeviceMotionEventPumpTest : public testing::Test { } protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { const DeviceMotionHardwareBuffer* null_buffer = NULL; listener_.reset(new MockDeviceMotionListener); motion_pump_.reset(new DeviceMotionEventPumpForTesting); diff --git a/content/renderer/device_sensors/device_orientation_event_pump.h b/content/renderer/device_sensors/device_orientation_event_pump.h index 9f97e91..43e566d 100644 --- a/content/renderer/device_sensors/device_orientation_event_pump.h +++ b/content/renderer/device_sensors/device_orientation_event_pump.h @@ -30,16 +30,16 @@ class CONTENT_EXPORT DeviceOrientationEventPump virtual ~DeviceOrientationEventPump(); // PlatformEventObserver. - virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void SendFakeDataForTesting(void* data) OVERRIDE; + virtual bool OnControlMessageReceived(const IPC::Message& message) override; + virtual void SendFakeDataForTesting(void* data) override; protected: - virtual void FireEvent() OVERRIDE; - virtual bool InitializeReader(base::SharedMemoryHandle handle) OVERRIDE; + virtual void FireEvent() override; + virtual bool InitializeReader(base::SharedMemoryHandle handle) override; // PlatformEventObserver. - virtual void SendStartMessage() OVERRIDE; - virtual void SendStopMessage() OVERRIDE; + virtual void SendStartMessage() override; + virtual void SendStopMessage() override; bool ShouldFireEvent(const blink::WebDeviceOrientationData& data) const; diff --git a/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc b/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc index 9b5cb84..f958501 100644 --- a/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc +++ b/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc @@ -22,7 +22,7 @@ class MockDeviceOrientationListener virtual ~MockDeviceOrientationListener() { } virtual void didChangeDeviceOrientation( - const blink::WebDeviceOrientationData& data) OVERRIDE { + const blink::WebDeviceOrientationData& data) override { memcpy(&data_, &data, sizeof(data)); did_change_device_orientation_ = true; } @@ -53,9 +53,9 @@ class DeviceOrientationEventPumpForTesting : public DeviceOrientationEventPump { void OnDidStart(base::SharedMemoryHandle renderer_handle) { DeviceOrientationEventPump::OnDidStart(renderer_handle); } - virtual void SendStartMessage() OVERRIDE { } - virtual void SendStopMessage() OVERRIDE { } - virtual void FireEvent() OVERRIDE { + virtual void SendStartMessage() override { } + virtual void SendStopMessage() override { } + virtual void FireEvent() override { DeviceOrientationEventPump::FireEvent(); Stop(); base::MessageLoop::current()->QuitWhenIdle(); @@ -73,7 +73,7 @@ class DeviceOrientationEventPumpTest : public testing::Test { } protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { const DeviceOrientationHardwareBuffer* null_buffer = NULL; listener_.reset(new MockDeviceOrientationListener); orientation_pump_.reset(new DeviceOrientationEventPumpForTesting); diff --git a/content/renderer/device_sensors/device_sensor_event_pump.h b/content/renderer/device_sensors/device_sensor_event_pump.h index e109c11..43e0f64 100644 --- a/content/renderer/device_sensors/device_sensor_event_pump.h +++ b/content/renderer/device_sensors/device_sensor_event_pump.h @@ -22,7 +22,7 @@ class CONTENT_EXPORT DeviceSensorEventPump base::Time::kMicrosecondsPerSecond / kDefaultPumpFrequencyHz; // PlatformEventObserver - virtual void Start(blink::WebPlatformEventListener* listener) OVERRIDE { + virtual void Start(blink::WebPlatformEventListener* listener) override { DVLOG(2) << "requested start"; if (state_ != STOPPED) @@ -34,7 +34,7 @@ class CONTENT_EXPORT DeviceSensorEventPump state_ = PENDING_START; } - virtual void Stop() OVERRIDE { + virtual void Stop() override { DVLOG(2) << "stop"; if (state_ == STOPPED) diff --git a/content/renderer/devtools/devtools_agent.h b/content/renderer/devtools/devtools_agent.h index 5861e44..660acbc 100644 --- a/content/renderer/devtools/devtools_agent.h +++ b/content/renderer/devtools/devtools_agent.h @@ -45,35 +45,35 @@ class DevToolsAgent : public RenderViewObserver, private: // RenderView::Observer implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // WebDevToolsAgentClient implementation virtual void sendMessageToInspectorFrontend(const blink::WebString& data); - virtual long processId() OVERRIDE; - virtual int debuggerId() OVERRIDE; - virtual void saveAgentRuntimeState(const blink::WebString& state) OVERRIDE; + virtual long processId() override; + virtual int debuggerId() override; + virtual void saveAgentRuntimeState(const blink::WebString& state) override; virtual blink::WebDevToolsAgentClient::WebKitClientMessageLoop* - createClientMessageLoop() OVERRIDE; - virtual void willEnterDebugLoop() OVERRIDE; - virtual void didExitDebugLoop() OVERRIDE; + createClientMessageLoop() override; + virtual void willEnterDebugLoop() override; + virtual void didExitDebugLoop() override; typedef void (*TraceEventCallback)( char phase, const unsigned char*, const char* name, unsigned long long id, int numArgs, const char* const* argNames, const unsigned char* argTypes, const unsigned long long* argValues, unsigned char flags, double timestamp); - virtual void resetTraceEventCallback() OVERRIDE; + virtual void resetTraceEventCallback() override; virtual void setTraceEventCallback(const blink::WebString& category_filter, - TraceEventCallback cb) OVERRIDE; - virtual void enableTracing(const blink::WebString& category_filter) OVERRIDE; - virtual void disableTracing() OVERRIDE; - virtual void startGPUEventsRecording() OVERRIDE; - virtual void stopGPUEventsRecording() OVERRIDE; + TraceEventCallback cb) override; + virtual void enableTracing(const blink::WebString& category_filter) override; + virtual void disableTracing() override; + virtual void startGPUEventsRecording() override; + virtual void stopGPUEventsRecording() override; virtual void enableDeviceEmulation( - const blink::WebDeviceEmulationParams& params) OVERRIDE; - virtual void disableDeviceEmulation() OVERRIDE; + const blink::WebDeviceEmulationParams& params) override; + virtual void disableDeviceEmulation() override; void OnAttach(const std::string& host_id); void OnReattach(const std::string& host_id, diff --git a/content/renderer/devtools/devtools_agent_filter.h b/content/renderer/devtools/devtools_agent_filter.h index 5097f42..a3470ee 100644 --- a/content/renderer/devtools/devtools_agent_filter.h +++ b/content/renderer/devtools/devtools_agent_filter.h @@ -33,7 +33,7 @@ class DevToolsAgentFilter : public IPC::MessageFilter { static void SendRpcMessage(const DevToolsMessageData& data); // IPC::MessageFilter override. Called on IO thread. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // Called on the main thread. void AddEmbeddedWorkerRouteOnMainThread(int32 routing_id); diff --git a/content/renderer/devtools/devtools_client.h b/content/renderer/devtools/devtools_client.h index 0c08324..f0321859b 100644 --- a/content/renderer/devtools/devtools_client.h +++ b/content/renderer/devtools/devtools_client.h @@ -36,10 +36,10 @@ class CONTENT_EXPORT DevToolsClient private: // WebDevToolsFrontendClient implementation. - virtual void sendMessageToBackend(const blink::WebString&) OVERRIDE; - virtual void sendMessageToEmbedder(const blink::WebString&) OVERRIDE; + virtual void sendMessageToBackend(const blink::WebString&) override; + virtual void sendMessageToEmbedder(const blink::WebString&) override; - virtual bool isUnderTest() OVERRIDE; + virtual bool isUnderTest() override; void OnDispatchOnInspectorFrontend(const std::string& message); diff --git a/content/renderer/dom_automation_controller.h b/content/renderer/dom_automation_controller.h index 92dc54e..cefb510 100644 --- a/content/renderer/dom_automation_controller.h +++ b/content/renderer/dom_automation_controller.h @@ -111,10 +111,10 @@ class DomAutomationController : public gin::Wrappable<DomAutomationController>, // gin::WrappableBase virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder( - v8::Isolate* isolate) OVERRIDE; + v8::Isolate* isolate) override; // RenderViewObserver - virtual void OnDestruct() OVERRIDE; + virtual void OnDestruct() override; int automation_id_; // routing id to be used by the next channel. diff --git a/content/renderer/dom_serializer_browsertest.cc b/content/renderer/dom_serializer_browsertest.cc index 8662c84..ac9500a 100644 --- a/content/renderer/dom_serializer_browsertest.cc +++ b/content/renderer/dom_serializer_browsertest.cc @@ -154,7 +154,7 @@ class LoadObserver : public RenderViewObserver { : RenderViewObserver(render_view), quit_closure_(quit_closure) {} - virtual void DidFinishLoad(blink::WebLocalFrame* frame) OVERRIDE { + virtual void DidFinishLoad(blink::WebLocalFrame* frame) override { if (frame == render_view()->GetWebView()->mainFrame()) quit_closure_.Run(); } @@ -170,7 +170,7 @@ class DomSerializerTests : public ContentBrowserTest, : serialized_(false), local_directory_name_(FILE_PATH_LITERAL("./dummy_files/")) {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(switches::kSingleProcess); #if defined(OS_WIN) // Don't want to try to create a GPU process. diff --git a/content/renderer/dom_storage/dom_storage_cached_area_unittest.cc b/content/renderer/dom_storage/dom_storage_cached_area_unittest.cc index eeec43e..39b1eb7 100644 --- a/content/renderer/dom_storage/dom_storage_cached_area_unittest.cc +++ b/content/renderer/dom_storage/dom_storage_cached_area_unittest.cc @@ -26,7 +26,7 @@ class MockProxy : public DOMStorageProxy { virtual void LoadArea(int connection_id, DOMStorageValuesMap* values, bool* send_log_get_messages, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { pending_callbacks_.push_back(callback); observed_load_area_ = true; observed_connection_id_ = connection_id; @@ -38,7 +38,7 @@ class MockProxy : public DOMStorageProxy { const base::string16& key, const base::string16& value, const GURL& page_url, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { pending_callbacks_.push_back(callback); observed_set_item_ = true; observed_connection_id_ = connection_id; @@ -49,13 +49,13 @@ class MockProxy : public DOMStorageProxy { virtual void LogGetItem(int connection_id, const base::string16& key, - const base::NullableString16& value) OVERRIDE { + const base::NullableString16& value) override { } virtual void RemoveItem(int connection_id, const base::string16& key, const GURL& page_url, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { pending_callbacks_.push_back(callback); observed_remove_item_ = true; observed_connection_id_ = connection_id; @@ -65,7 +65,7 @@ class MockProxy : public DOMStorageProxy { virtual void ClearArea(int connection_id, const GURL& page_url, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { pending_callbacks_.push_back(callback); observed_clear_area_ = true; observed_connection_id_ = connection_id; diff --git a/content/renderer/dom_storage/dom_storage_dispatcher.cc b/content/renderer/dom_storage/dom_storage_dispatcher.cc index 6764a9b..6d44966 100644 --- a/content/renderer/dom_storage/dom_storage_dispatcher.cc +++ b/content/renderer/dom_storage/dom_storage_dispatcher.cc @@ -41,7 +41,7 @@ class MessageThrottlingFilter : public IPC::MessageFilter { private: virtual ~MessageThrottlingFilter() {} - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; int GetPendingCount() { return IncrementPendingCountN(0); } int IncrementPendingCount() { return IncrementPendingCountN(1); } @@ -111,18 +111,18 @@ class DomStorageDispatcher::ProxyImpl : public DOMStorageProxy { // DOMStorageProxy interface for use by DOMStorageCachedArea. virtual void LoadArea(int connection_id, DOMStorageValuesMap* values, bool* send_log_get_messages, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual void SetItem(int connection_id, const base::string16& key, const base::string16& value, const GURL& page_url, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual void LogGetItem(int connection_id, const base::string16& key, - const base::NullableString16& value) OVERRIDE; + const base::NullableString16& value) override; virtual void RemoveItem(int connection_id, const base::string16& key, const GURL& page_url, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual void ClearArea(int connection_id, const GURL& page_url, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; private: // Struct to hold references to our contained areas and diff --git a/content/renderer/external_popup_menu_browsertest.cc b/content/renderer/external_popup_menu_browsertest.cc index e58d764..e23573d 100644 --- a/content/renderer/external_popup_menu_browsertest.cc +++ b/content/renderer/external_popup_menu_browsertest.cc @@ -133,7 +133,7 @@ class ExternalPopupMenuRemoveTest : public ExternalPopupMenuTest { ExternalPopupMenuRemoveTest() {} protected: - virtual bool ShouldRemoveSelectOnChange() const OVERRIDE { return true; } + virtual bool ShouldRemoveSelectOnChange() const override { return true; } }; // Tests that nothing bad happen when the page removes the select when it diff --git a/content/renderer/fetchers/resource_fetcher_impl.h b/content/renderer/fetchers/resource_fetcher_impl.h index 5631ed9..73c55b3 100644 --- a/content/renderer/fetchers/resource_fetcher_impl.h +++ b/content/renderer/fetchers/resource_fetcher_impl.h @@ -31,16 +31,16 @@ class ResourceFetcherImpl : public ResourceFetcher, public WebURLLoaderClientImpl { public: // ResourceFetcher implementation: - virtual void SetMethod(const std::string& method) OVERRIDE; - virtual void SetBody(const std::string& body) OVERRIDE; + virtual void SetMethod(const std::string& method) override; + virtual void SetBody(const std::string& body) override; virtual void SetHeader(const std::string& header, - const std::string& value) OVERRIDE; + const std::string& value) override; virtual void Start(blink::WebFrame* frame, blink::WebURLRequest::RequestContext request_context, blink::WebURLRequest::FrameType frame_type, LoaderType loader_type, - const Callback& callback) OVERRIDE; - virtual void SetTimeout(const base::TimeDelta& timeout) OVERRIDE; + const Callback& callback) override; + virtual void SetTimeout(const base::TimeDelta& timeout) override; private: friend class ResourceFetcher; @@ -54,8 +54,8 @@ class ResourceFetcherImpl : public ResourceFetcher, void TimeoutFired(); // WebURLLoaderClientImpl methods: - virtual void OnLoadComplete() OVERRIDE; - virtual void Cancel() OVERRIDE; + virtual void OnLoadComplete() override; + virtual void Cancel() override; scoped_ptr<blink::WebURLLoader> loader_; diff --git a/content/renderer/gamepad_shared_memory_reader.h b/content/renderer/gamepad_shared_memory_reader.h index d62f881..f7343ae 100644 --- a/content/renderer/gamepad_shared_memory_reader.h +++ b/content/renderer/gamepad_shared_memory_reader.h @@ -22,14 +22,14 @@ class GamepadSharedMemoryReader : public RendererGamepadProvider { // RendererGamepadProvider implementation. virtual void SampleGamepads( - blink::WebGamepads& gamepads) OVERRIDE; - virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void Start(blink::WebPlatformEventListener* listener) OVERRIDE; + blink::WebGamepads& gamepads) override; + virtual bool OnControlMessageReceived(const IPC::Message& message) override; + virtual void Start(blink::WebPlatformEventListener* listener) override; protected: // PlatformEventObserver protected methods. - virtual void SendStartMessage() OVERRIDE; - virtual void SendStopMessage() OVERRIDE; + virtual void SendStartMessage() override; + virtual void SendStopMessage() override; private: void OnGamepadConnected(int index, const blink::WebGamepad& gamepad); diff --git a/content/renderer/geolocation_dispatcher.h b/content/renderer/geolocation_dispatcher.h index f4f9163..8508514 100644 --- a/content/renderer/geolocation_dispatcher.h +++ b/content/renderer/geolocation_dispatcher.h @@ -31,7 +31,7 @@ class GeolocationDispatcher : public RenderFrameObserver, private: // RenderFrame::Observer implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // WebGeolocationClient virtual void startUpdating(); diff --git a/content/renderer/gin_browsertest.cc b/content/renderer/gin_browsertest.cc index 20fa560..7b92c7d 100644 --- a/content/renderer/gin_browsertest.cc +++ b/content/renderer/gin_browsertest.cc @@ -42,7 +42,7 @@ class GinBrowserTest : public RenderViewTest { GinBrowserTest() {} virtual ~GinBrowserTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { CommandLine::ForCurrentProcess()->AppendSwitchASCII( switches::kJavaScriptFlags, "--expose_gc"); diff --git a/content/renderer/gpu/compositor_output_surface.h b/content/renderer/gpu/compositor_output_surface.h index 0b369b2..51cc317 100644 --- a/content/renderer/gpu/compositor_output_surface.h +++ b/content/renderer/gpu/compositor_output_surface.h @@ -56,15 +56,15 @@ class CompositorOutputSurface virtual ~CompositorOutputSurface(); // cc::OutputSurface implementation. - virtual bool BindToClient(cc::OutputSurfaceClient* client) OVERRIDE; - virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE; + virtual bool BindToClient(cc::OutputSurfaceClient* client) override; + virtual void SwapBuffers(cc::CompositorFrame* frame) override; #if defined(OS_ANDROID) - virtual void SetNeedsBeginFrame(bool enable) OVERRIDE; + virtual void SetNeedsBeginFrame(bool enable) override; #endif // TODO(epenner): This seems out of place here and would be a better fit // int CompositorThread after it is fully refactored (http://crbug/170828) - virtual void UpdateSmoothnessTakesPriority(bool prefer_smoothness) OVERRIDE; + virtual void UpdateSmoothnessTakesPriority(bool prefer_smoothness) override; protected: void ShortcutSwapAck(uint32 output_surface_id, diff --git a/content/renderer/gpu/compositor_software_output_device.h b/content/renderer/gpu/compositor_software_output_device.h index 3f232e0..b57ac26 100644 --- a/content/renderer/gpu/compositor_software_output_device.h +++ b/content/renderer/gpu/compositor_software_output_device.h @@ -31,14 +31,14 @@ class CompositorSoftwareOutputDevice CompositorSoftwareOutputDevice(); virtual ~CompositorSoftwareOutputDevice(); - virtual void Resize(const gfx::Size& pixel_size, float scale_factor) OVERRIDE; + virtual void Resize(const gfx::Size& pixel_size, float scale_factor) override; - virtual SkCanvas* BeginPaint(const gfx::Rect& damage_rect) OVERRIDE; - virtual void EndPaint(cc::SoftwareFrameData* frame_data) OVERRIDE; - virtual void EnsureBackbuffer() OVERRIDE; - virtual void DiscardBackbuffer() OVERRIDE; + virtual SkCanvas* BeginPaint(const gfx::Rect& damage_rect) override; + virtual void EndPaint(cc::SoftwareFrameData* frame_data) override; + virtual void EnsureBackbuffer() override; + virtual void DiscardBackbuffer() override; - virtual void ReclaimSoftwareFrame(unsigned id) OVERRIDE; + virtual void ReclaimSoftwareFrame(unsigned id) override; private: // Internal buffer class that manages shared memory lifetime and ownership. diff --git a/content/renderer/gpu/frame_swap_message_queue.cc b/content/renderer/gpu/frame_swap_message_queue.cc index df4185d..979f250 100644 --- a/content/renderer/gpu/frame_swap_message_queue.cc +++ b/content/renderer/gpu/frame_swap_message_queue.cc @@ -36,7 +36,7 @@ namespace { class SendMessageScopeImpl : public FrameSwapMessageQueue::SendMessageScope { public: SendMessageScopeImpl(base::Lock* lock) : auto_lock_(*lock) {} - virtual ~SendMessageScopeImpl() OVERRIDE {} + virtual ~SendMessageScopeImpl() override {} private: base::AutoLock auto_lock_; @@ -53,11 +53,11 @@ class VisualStateQueue : public FrameSwapMessageSubQueue { } } - virtual bool Empty() const OVERRIDE { return queue_.empty(); } + virtual bool Empty() const override { return queue_.empty(); } virtual void QueueMessage(int source_frame_number, scoped_ptr<IPC::Message> msg, - bool* is_first) OVERRIDE { + bool* is_first) override { if (is_first) *is_first = (queue_.count(source_frame_number) == 0); @@ -65,7 +65,7 @@ class VisualStateQueue : public FrameSwapMessageSubQueue { } virtual void DrainMessages(int source_frame_number, - ScopedVector<IPC::Message>* messages) OVERRIDE { + ScopedVector<IPC::Message>* messages) override { VisualStateQueueMap::iterator end = queue_.upper_bound(source_frame_number); for (VisualStateQueueMap::iterator i = queue_.begin(); i != end; i++) { DCHECK(i->first <= source_frame_number); @@ -86,18 +86,18 @@ class VisualStateQueue : public FrameSwapMessageSubQueue { class SwapQueue : public FrameSwapMessageSubQueue { public: SwapQueue() {} - virtual bool Empty() const OVERRIDE { return queue_.empty(); } + virtual bool Empty() const override { return queue_.empty(); } virtual void QueueMessage(int source_frame_number, scoped_ptr<IPC::Message> msg, - bool* is_first) OVERRIDE { + bool* is_first) override { if (is_first) *is_first = Empty(); queue_.push_back(msg.release()); } virtual void DrainMessages(int source_frame_number, - ScopedVector<IPC::Message>* messages) OVERRIDE { + ScopedVector<IPC::Message>* messages) override { messages->insert(messages->end(), queue_.begin(), queue_.end()); queue_.weak_clear(); } diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc index a2e948d..4af1540 100644 --- a/content/renderer/gpu/gpu_benchmarking_extension.cc +++ b/content/renderer/gpu/gpu_benchmarking_extension.cc @@ -340,7 +340,7 @@ class GpuBenchmarkingWrapper : public v8::Extension { virtual v8::Handle<v8::FunctionTemplate> GetNativeFunctionTemplate( v8::Isolate* isolate, - v8::Handle<v8::String> name) OVERRIDE { + v8::Handle<v8::String> name) override { if (name->Equals( v8::String::NewFromUtf8(isolate, "SetNeedsDisplayOnAllLayers"))) return v8::FunctionTemplate::New(isolate, SetNeedsDisplayOnAllLayers); diff --git a/content/renderer/gpu/mailbox_output_surface.h b/content/renderer/gpu/mailbox_output_surface.h index 8ba90b4..53230c4 100644 --- a/content/renderer/gpu/mailbox_output_surface.h +++ b/content/renderer/gpu/mailbox_output_surface.h @@ -36,16 +36,16 @@ class MailboxOutputSurface : public CompositorOutputSurface { virtual ~MailboxOutputSurface(); // cc::OutputSurface implementation. - virtual void EnsureBackbuffer() OVERRIDE; - virtual void DiscardBackbuffer() OVERRIDE; - virtual void Reshape(const gfx::Size& size, float scale_factor) OVERRIDE; - virtual void BindFramebuffer() OVERRIDE; - virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE; + virtual void EnsureBackbuffer() override; + virtual void DiscardBackbuffer() override; + virtual void Reshape(const gfx::Size& size, float scale_factor) override; + virtual void BindFramebuffer() override; + virtual void SwapBuffers(cc::CompositorFrame* frame) override; private: // CompositorOutputSurface overrides. virtual void OnSwapAck(uint32 output_surface_id, - const cc::CompositorFrameAck& ack) OVERRIDE; + const cc::CompositorFrameAck& ack) override; size_t GetNumAcksPending(); diff --git a/content/renderer/gpu/queue_message_swap_promise.h b/content/renderer/gpu/queue_message_swap_promise.h index d3eabf1..0f4ea1d 100644 --- a/content/renderer/gpu/queue_message_swap_promise.h +++ b/content/renderer/gpu/queue_message_swap_promise.h @@ -25,11 +25,11 @@ class QueueMessageSwapPromise : public cc::SwapPromise { virtual ~QueueMessageSwapPromise(); - virtual void DidSwap(cc::CompositorFrameMetadata* metadata) OVERRIDE; + virtual void DidSwap(cc::CompositorFrameMetadata* metadata) override; - virtual void DidNotSwap(DidNotSwapReason reason) OVERRIDE; + virtual void DidNotSwap(DidNotSwapReason reason) override; - virtual int64 TraceId() const OVERRIDE; + virtual int64 TraceId() const override; private: void PromiseCompleted(); diff --git a/content/renderer/gpu/queue_message_swap_promise_unittest.cc b/content/renderer/gpu/queue_message_swap_promise_unittest.cc index f151d4c..562f41c 100644 --- a/content/renderer/gpu/queue_message_swap_promise_unittest.cc +++ b/content/renderer/gpu/queue_message_swap_promise_unittest.cc @@ -33,7 +33,7 @@ class TestSyncMessageFilter : public IPC::SyncMessageFilter { public: TestSyncMessageFilter() : IPC::SyncMessageFilter(NULL) {} - virtual bool Send(IPC::Message* message) OVERRIDE { + virtual bool Send(IPC::Message* message) override { messages_.push_back(message); return true; } diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h index 88367b3..044c953 100644 --- a/content/renderer/gpu/render_widget_compositor.h +++ b/content/renderer/gpu/render_widget_compositor.h @@ -116,11 +116,11 @@ class CONTENT_EXPORT RenderWidgetCompositor virtual void registerViewportLayers( const blink::WebLayer* pageScaleLayer, const blink::WebLayer* innerViewportScrollLayer, - const blink::WebLayer* outerViewportScrollLayer) OVERRIDE; - virtual void clearViewportLayers() OVERRIDE; + const blink::WebLayer* outerViewportScrollLayer) override; + virtual void clearViewportLayers() override; virtual void registerSelection(const blink::WebSelectionBound& start, - const blink::WebSelectionBound& end) OVERRIDE; - virtual void clearSelection() OVERRIDE; + const blink::WebSelectionBound& end) override; + virtual void clearSelection() override; virtual void setShowFPSCounter(bool show); virtual void setShowPaintRects(bool show); virtual void setShowDebugBorders(bool show); @@ -129,29 +129,29 @@ class CONTENT_EXPORT RenderWidgetCompositor virtual void setTopControlsContentOffset(float); // cc::LayerTreeHostClient implementation. - virtual void WillBeginMainFrame(int frame_id) OVERRIDE; - virtual void DidBeginMainFrame() OVERRIDE; - virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE; - virtual void Layout() OVERRIDE; + virtual void WillBeginMainFrame(int frame_id) override; + virtual void DidBeginMainFrame() override; + virtual void BeginMainFrame(const cc::BeginFrameArgs& args) override; + virtual void Layout() override; virtual void ApplyViewportDeltas(const gfx::Vector2d& inner_delta, const gfx::Vector2d& outer_delta, float page_scale, - float top_controls_delta) OVERRIDE; + float top_controls_delta) override; virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, float page_scale, - float top_controls_delta) OVERRIDE; - virtual void RequestNewOutputSurface(bool fallback) OVERRIDE; - virtual void DidInitializeOutputSurface() OVERRIDE; - virtual void WillCommit() OVERRIDE; - virtual void DidCommit() OVERRIDE; - virtual void DidCommitAndDrawFrame() OVERRIDE; - virtual void DidCompleteSwapBuffers() OVERRIDE; - virtual void RateLimitSharedMainThreadContext() OVERRIDE; + float top_controls_delta) override; + virtual void RequestNewOutputSurface(bool fallback) override; + virtual void DidInitializeOutputSurface() override; + virtual void WillCommit() override; + virtual void DidCommit() override; + virtual void DidCommitAndDrawFrame() override; + virtual void DidCompleteSwapBuffers() override; + virtual void RateLimitSharedMainThreadContext() override; // cc::LayerTreeHostSingleThreadClient implementation. - virtual void ScheduleAnimation() OVERRIDE; - virtual void DidPostSwapBuffers() OVERRIDE; - virtual void DidAbortSwapBuffers() OVERRIDE; + virtual void ScheduleAnimation() override; + virtual void DidPostSwapBuffers() override; + virtual void DidAbortSwapBuffers() override; private: RenderWidgetCompositor(RenderWidget* widget, bool threaded); diff --git a/content/renderer/gpu/stream_texture_host_android.h b/content/renderer/gpu/stream_texture_host_android.h index 005d49d..4bd8413 100644 --- a/content/renderer/gpu/stream_texture_host_android.h +++ b/content/renderer/gpu/stream_texture_host_android.h @@ -38,8 +38,8 @@ class StreamTextureHost : public IPC::Listener { bool BindToCurrentThread(int32 stream_id, Listener* listener); // IPC::Channel::Listener implementation: - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnChannelError() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void OnChannelError() override; private: // Message handlers: diff --git a/content/renderer/ico_image_decoder_unittest.cc b/content/renderer/ico_image_decoder_unittest.cc index b59cfe3..28d18d6 100644 --- a/content/renderer/ico_image_decoder_unittest.cc +++ b/content/renderer/ico_image_decoder_unittest.cc @@ -13,7 +13,7 @@ class ICOImageDecoderTest : public ImageDecoderTest { ICOImageDecoderTest() : ImageDecoderTest("ico") { } protected: - virtual blink::WebImageDecoder* CreateWebKitImageDecoder() const OVERRIDE { + virtual blink::WebImageDecoder* CreateWebKitImageDecoder() const override { return new blink::WebImageDecoder(blink::WebImageDecoder::TypeICO); } }; diff --git a/content/renderer/idle_user_detector.h b/content/renderer/idle_user_detector.h index a5ee80b..516706b 100644 --- a/content/renderer/idle_user_detector.h +++ b/content/renderer/idle_user_detector.h @@ -27,7 +27,7 @@ class IdleUserDetector : public RenderViewObserver { private: // RenderViewObserver implementation: - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; void OnHandleInputEvent(const blink::WebInputEvent* event, const ui::LatencyInfo& latency_info, diff --git a/content/renderer/image_loading_helper.h b/content/renderer/image_loading_helper.h index a7d24d6..9772986 100644 --- a/content/renderer/image_loading_helper.h +++ b/content/renderer/image_loading_helper.h @@ -60,7 +60,7 @@ class ImageLoadingHelper : public RenderFrameObserver { SkBitmap ImageFromDataUrl(const GURL&) const; // RenderFrameObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; typedef ScopedVector<MultiResolutionImageResourceFetcher> ImageResourceFetcherList; diff --git a/content/renderer/in_process_renderer_thread.h b/content/renderer/in_process_renderer_thread.h index bc5a5d3..56b4a8b 100644 --- a/content/renderer/in_process_renderer_thread.h +++ b/content/renderer/in_process_renderer_thread.h @@ -21,8 +21,8 @@ class InProcessRendererThread : public base::Thread { virtual ~InProcessRendererThread(); protected: - virtual void Init() OVERRIDE; - virtual void CleanUp() OVERRIDE; + virtual void Init() override; + virtual void CleanUp() override; private: std::string channel_id_; diff --git a/content/renderer/input/input_event_filter.h b/content/renderer/input/input_event_filter.h index 0e39592..59af5d4 100644 --- a/content/renderer/input/input_event_filter.h +++ b/content/renderer/input/input_event_filter.h @@ -54,19 +54,19 @@ class CONTENT_EXPORT InputEventFilter : public InputHandlerManagerClient, // is left to the eventual handler to deliver the corresponding // InputHostMsg_HandleInputEvent_ACK. // - virtual void SetBoundHandler(const Handler& handler) OVERRIDE; + virtual void SetBoundHandler(const Handler& handler) override; virtual void DidAddInputHandler(int routing_id, - cc::InputHandler* input_handler) OVERRIDE; - virtual void DidRemoveInputHandler(int routing_id) OVERRIDE; + cc::InputHandler* input_handler) override; + virtual void DidRemoveInputHandler(int routing_id) override; virtual void DidOverscroll(int routing_id, - const DidOverscrollParams& params) OVERRIDE; - virtual void DidStopFlinging(int routing_id) OVERRIDE; + const DidOverscrollParams& params) override; + virtual void DidStopFlinging(int routing_id) override; // IPC::MessageFilter methods: - virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE; - virtual void OnFilterRemoved() OVERRIDE; - virtual void OnChannelClosing() OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual void OnFilterAdded(IPC::Sender* sender) override; + virtual void OnFilterRemoved() override; + virtual void OnChannelClosing() override; + virtual bool OnMessageReceived(const IPC::Message& message) override; private: virtual ~InputEventFilter(); diff --git a/content/renderer/input/input_event_filter_unittest.cc b/content/renderer/input/input_event_filter_unittest.cc index d181a03..34f0fa9 100644 --- a/content/renderer/input/input_event_filter_unittest.cc +++ b/content/renderer/input/input_event_filter_unittest.cc @@ -80,7 +80,7 @@ class InputEventRecorder { class IPCMessageRecorder : public IPC::Listener { public: - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) override { messages_.push_back(message); return true; } @@ -125,7 +125,7 @@ void AddEventsToFilter(IPC::MessageFilter* message_filter, class InputEventFilterTest : public testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { filter_ = new InputEventFilter(&message_recorder_, base::MessageLoopProxy::current(), message_loop_.message_loop_proxy()); diff --git a/content/renderer/input/input_handler_proxy.h b/content/renderer/input/input_handler_proxy.h index c5f7897..38262a0 100644 --- a/content/renderer/input/input_handler_proxy.h +++ b/content/renderer/input/input_handler_proxy.h @@ -42,13 +42,13 @@ class CONTENT_EXPORT InputHandlerProxy EventDisposition HandleInputEvent(const blink::WebInputEvent& event); // cc::InputHandlerClient implementation. - virtual void WillShutdown() OVERRIDE; - virtual void Animate(base::TimeTicks time) OVERRIDE; - virtual void MainThreadHasStoppedFlinging() OVERRIDE; + virtual void WillShutdown() override; + virtual void Animate(base::TimeTicks time) override; + virtual void MainThreadHasStoppedFlinging() override; virtual void DidOverscroll( const gfx::PointF& causal_event_viewport_point, const gfx::Vector2dF& accumulated_overscroll, - const gfx::Vector2dF& latest_overscroll_delta) OVERRIDE; + const gfx::Vector2dF& latest_overscroll_delta) override; // blink::WebGestureCurveTarget implementation. virtual bool scrollBy(const blink::WebFloatSize& offset, diff --git a/content/renderer/input/input_handler_proxy_unittest.cc b/content/renderer/input/input_handler_proxy_unittest.cc index d64288c..59f3efd 100644 --- a/content/renderer/input/input_handler_proxy_unittest.cc +++ b/content/renderer/input/input_handler_proxy_unittest.cc @@ -99,13 +99,13 @@ class MockInputHandler : public cc::InputHandler { MOCK_METHOD0(FlingScrollBegin, cc::InputHandler::ScrollStatus()); virtual scoped_ptr<cc::SwapPromiseMonitor> - CreateLatencyInfoSwapPromiseMonitor(ui::LatencyInfo* latency) OVERRIDE { + CreateLatencyInfoSwapPromiseMonitor(ui::LatencyInfo* latency) override { return scoped_ptr<cc::SwapPromiseMonitor>(); } - virtual void BindToClient(cc::InputHandlerClient* client) OVERRIDE {} + virtual void BindToClient(cc::InputHandlerClient* client) override {} - virtual void MouseMoveAt(const gfx::Point& mouse_position) OVERRIDE {} + virtual void MouseMoveAt(const gfx::Point& mouse_position) override {} MOCK_METHOD2(IsCurrentlyScrollingLayerAt, bool(const gfx::Point& point, @@ -115,9 +115,9 @@ class MockInputHandler : public cc::InputHandler { virtual void SetRootLayerScrollOffsetDelegate( cc::LayerScrollOffsetDelegate* root_layer_scroll_offset_delegate) - OVERRIDE {} + override {} - virtual void OnRootLayerDelegatedScrollOffsetChanged() OVERRIDE {} + virtual void OnRootLayerDelegatedScrollOffsetChanged() override {} DISALLOW_COPY_AND_ASSIGN(MockInputHandler); }; @@ -158,7 +158,7 @@ class MockInputHandlerProxyClient MockInputHandlerProxyClient() {} virtual ~MockInputHandlerProxyClient() {} - virtual void WillShutdown() OVERRIDE {} + virtual void WillShutdown() override {} MOCK_METHOD1(TransferActiveWheelFlingAnimation, void(const WebActiveWheelFlingParameters&)); @@ -166,15 +166,15 @@ class MockInputHandlerProxyClient virtual blink::WebGestureCurve* CreateFlingAnimationCurve( WebGestureDevice deviceSource, const WebFloatPoint& velocity, - const WebSize& cumulative_scroll) OVERRIDE { + const WebSize& cumulative_scroll) override { return new FakeWebGestureCurve( blink::WebFloatSize(velocity.x, velocity.y), blink::WebFloatSize(cumulative_scroll.width, cumulative_scroll.height)); } MOCK_METHOD1(DidOverscroll, void(const DidOverscrollParams&)); - virtual void DidStopFlinging() OVERRIDE {} - virtual void DidReceiveInputEvent() OVERRIDE {} + virtual void DidStopFlinging() override {} + virtual void DidReceiveInputEvent() override {} private: DISALLOW_COPY_AND_ASSIGN(MockInputHandlerProxyClient); diff --git a/content/renderer/input/input_handler_wrapper.h b/content/renderer/input/input_handler_wrapper.h index e43040e..063267e 100644 --- a/content/renderer/input/input_handler_wrapper.h +++ b/content/renderer/input/input_handler_wrapper.h @@ -27,16 +27,16 @@ class InputHandlerWrapper : public InputHandlerProxyClient { InputHandlerProxy* input_handler_proxy() { return &input_handler_proxy_; } // InputHandlerProxyClient implementation. - virtual void WillShutdown() OVERRIDE; + virtual void WillShutdown() override; virtual void TransferActiveWheelFlingAnimation( - const blink::WebActiveWheelFlingParameters& params) OVERRIDE; + const blink::WebActiveWheelFlingParameters& params) override; virtual blink::WebGestureCurve* CreateFlingAnimationCurve( blink::WebGestureDevice deviceSource, const blink::WebFloatPoint& velocity, - const blink::WebSize& cumulativeScroll) OVERRIDE; - virtual void DidOverscroll(const DidOverscrollParams& params) OVERRIDE; - virtual void DidStopFlinging() OVERRIDE; - virtual void DidReceiveInputEvent() OVERRIDE; + const blink::WebSize& cumulativeScroll) override; + virtual void DidOverscroll(const DidOverscrollParams& params) override; + virtual void DidStopFlinging() override; + virtual void DidReceiveInputEvent() override; private: InputHandlerManager* input_handler_manager_; diff --git a/content/renderer/java/gin_java_bridge_dispatcher.h b/content/renderer/java/gin_java_bridge_dispatcher.h index efbd19f..f9d5f54 100644 --- a/content/renderer/java/gin_java_bridge_dispatcher.h +++ b/content/renderer/java/gin_java_bridge_dispatcher.h @@ -44,8 +44,8 @@ class GinJavaBridgeDispatcher virtual ~GinJavaBridgeDispatcher(); // RenderFrameObserver override: - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void DidClearWindowObject() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void DidClearWindowObject() override; void GetJavaMethods(ObjectID object_id, std::set<std::string>* methods); bool HasJavaMethod(ObjectID object_id, const std::string& method_name); diff --git a/content/renderer/java/gin_java_bridge_object.h b/content/renderer/java/gin_java_bridge_object.h index 2f6c6e4..f3a4c7b 100644 --- a/content/renderer/java/gin_java_bridge_object.h +++ b/content/renderer/java/gin_java_bridge_object.h @@ -32,13 +32,13 @@ class GinJavaBridgeObject : public gin::Wrappable<GinJavaBridgeObject>, // gin::Wrappable. virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder( - v8::Isolate* isolate) OVERRIDE; + v8::Isolate* isolate) override; // gin::NamedPropertyInterceptor virtual v8::Local<v8::Value> GetNamedProperty( - v8::Isolate* isolate, const std::string& property) OVERRIDE; + v8::Isolate* isolate, const std::string& property) override; virtual std::vector<std::string> EnumerateNamedProperties( - v8::Isolate* isolate) OVERRIDE; + v8::Isolate* isolate) override; static GinJavaBridgeObject* InjectNamed( blink::WebFrame* frame, diff --git a/content/renderer/java/gin_java_bridge_value_converter.cc b/content/renderer/java/gin_java_bridge_value_converter.cc index ad8fee9..79c5219 100644 --- a/content/renderer/java/gin_java_bridge_value_converter.cc +++ b/content/renderer/java/gin_java_bridge_value_converter.cc @@ -75,7 +75,7 @@ class TypedArraySerializerImpl : public TypedArraySerializer { virtual void serializeTo(char* data, size_t data_length, - base::ListValue* out) OVERRIDE { + base::ListValue* out) override { DCHECK_EQ(data_length, typed_array_->Length() * sizeof(ElementType)); for (ElementType *element = reinterpret_cast<ElementType*>(data), *end = element + typed_array_->Length(); diff --git a/content/renderer/java/gin_java_bridge_value_converter.h b/content/renderer/java/gin_java_bridge_value_converter.h index 5b834ea..fd343b9 100644 --- a/content/renderer/java/gin_java_bridge_value_converter.h +++ b/content/renderer/java/gin_java_bridge_value_converter.h @@ -27,13 +27,13 @@ class GinJavaBridgeValueConverter : public content::V8ValueConverter::Strategy { virtual bool FromV8Object(v8::Handle<v8::Object> value, base::Value** out, v8::Isolate* isolate, - const FromV8ValueCallback& callback) const OVERRIDE; + const FromV8ValueCallback& callback) const override; virtual bool FromV8ArrayBuffer(v8::Handle<v8::Object> value, base::Value** out, - v8::Isolate* isolate) const OVERRIDE; + v8::Isolate* isolate) const override; virtual bool FromV8Number(v8::Handle<v8::Number> value, - base::Value** out) const OVERRIDE; - virtual bool FromV8Undefined(base::Value** out) const OVERRIDE; + base::Value** out) const override; + virtual bool FromV8Undefined(base::Value** out) const override; private: scoped_ptr<V8ValueConverter> converter_; diff --git a/content/renderer/manifest/manifest_manager.h b/content/renderer/manifest/manifest_manager.h index 3361138..bae1fef 100644 --- a/content/renderer/manifest/manifest_manager.h +++ b/content/renderer/manifest/manifest_manager.h @@ -40,8 +40,8 @@ class ManifestManager : public RenderFrameObserver { void GetManifest(const GetManifestCallback& callback); // RenderFrameObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void DidChangeManifest() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void DidChangeManifest() override; private: enum ResolveState { diff --git a/content/renderer/media/aec_dump_message_filter.h b/content/renderer/media/aec_dump_message_filter.h index 7268132..835171b 100644 --- a/content/renderer/media/aec_dump_message_filter.h +++ b/content/renderer/media/aec_dump_message_filter.h @@ -64,10 +64,10 @@ class CONTENT_EXPORT AecDumpMessageFilter : public IPC::MessageFilter { void UnregisterAecDumpConsumer(int id); // IPC::MessageFilter override. Called on |io_message_loop|. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE; - virtual void OnFilterRemoved() OVERRIDE; - virtual void OnChannelClosing() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void OnFilterAdded(IPC::Sender* sender) override; + virtual void OnFilterRemoved() override; + virtual void OnChannelClosing() override; // Accessed on |io_message_loop|. void OnEnableAecDump(int id, IPC::PlatformFileForTransit file_handle); diff --git a/content/renderer/media/android/media_source_delegate.h b/content/renderer/media/android/media_source_delegate.h index 4f66be7..c451e07 100644 --- a/content/renderer/media/android/media_source_delegate.h +++ b/content/renderer/media/android/media_source_delegate.h @@ -105,12 +105,12 @@ class MediaSourceDelegate : public media::DemuxerHost { private: // Methods inherited from DemuxerHost. virtual void AddBufferedTimeRange(base::TimeDelta start, - base::TimeDelta end) OVERRIDE; - virtual void SetDuration(base::TimeDelta duration) OVERRIDE; - virtual void OnDemuxerError(media::PipelineStatus status) OVERRIDE; + base::TimeDelta end) override; + virtual void SetDuration(base::TimeDelta duration) override; + virtual void OnDemuxerError(media::PipelineStatus status) override; virtual void AddTextStream(media::DemuxerStream* text_stream, - const media::TextTrackConfig& config) OVERRIDE; - virtual void RemoveTextStream(media::DemuxerStream* text_stream) OVERRIDE; + const media::TextTrackConfig& config) override; + virtual void RemoveTextStream(media::DemuxerStream* text_stream) override; // Notifies |demuxer_client_| and fires |duration_changed_cb_|. void OnDurationChanged(const base::TimeDelta& duration); diff --git a/content/renderer/media/android/renderer_demuxer_android.h b/content/renderer/media/android/renderer_demuxer_android.h index 99c8cc9..2fddc86 100644 --- a/content/renderer/media/android/renderer_demuxer_android.h +++ b/content/renderer/media/android/renderer_demuxer_android.h @@ -44,7 +44,7 @@ class RendererDemuxerAndroid : public IPC::MessageFilter { void RemoveDelegate(int demuxer_client_id); // IPC::MessageFilter overrides. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // media::DemuxerAndroidClient "implementation". // diff --git a/content/renderer/media/android/renderer_media_player_manager.h b/content/renderer/media/android/renderer_media_player_manager.h index 454e033..8a9fbb3 100644 --- a/content/renderer/media/android/renderer_media_player_manager.h +++ b/content/renderer/media/android/renderer_media_player_manager.h @@ -37,8 +37,8 @@ class RendererMediaPlayerManager : public RenderFrameObserver { virtual ~RendererMediaPlayerManager(); // RenderFrameObserver overrides. - virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; - virtual void WasHidden() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& msg) override; + virtual void WasHidden() override; // Initializes a MediaPlayerAndroid object in browser process. void Initialize(MediaPlayerHostMsg_Initialize_Type type, @@ -96,7 +96,7 @@ class RendererMediaPlayerManager : public RenderFrameObserver { void RequestExternalSurface(int player_id, const gfx::RectF& geometry); // RenderFrameObserver overrides. - virtual void DidCommitCompositorFrame() OVERRIDE; + virtual void DidCommitCompositorFrame() override; // Returns true if a media player should use video-overlay for the embedded // encrypted video. diff --git a/content/renderer/media/android/stream_texture_factory_impl.cc b/content/renderer/media/android/stream_texture_factory_impl.cc index 09466c5..48b5861 100644 --- a/content/renderer/media/android/stream_texture_factory_impl.cc +++ b/content/renderer/media/android/stream_texture_factory_impl.cc @@ -24,12 +24,12 @@ class StreamTextureProxyImpl : public StreamTextureProxy, // StreamTextureProxy implementation: virtual void BindToLoop(int32 stream_id, cc::VideoFrameProvider::Client* client, - scoped_refptr<base::MessageLoopProxy> loop) OVERRIDE; - virtual void Release() OVERRIDE; + scoped_refptr<base::MessageLoopProxy> loop) override; + virtual void Release() override; // StreamTextureHost::Listener implementation: - virtual void OnFrameAvailable() OVERRIDE; - virtual void OnMatrixChanged(const float matrix[16]) OVERRIDE; + virtual void OnFrameAvailable() override; + virtual void OnMatrixChanged(const float matrix[16]) override; private: void BindOnThread(int32 stream_id); diff --git a/content/renderer/media/android/stream_texture_factory_impl.h b/content/renderer/media/android/stream_texture_factory_impl.h index 62586b0..f5ded1c 100644 --- a/content/renderer/media/android/stream_texture_factory_impl.h +++ b/content/renderer/media/android/stream_texture_factory_impl.h @@ -29,17 +29,17 @@ class StreamTextureFactoryImpl : public StreamTextureFactory { int frame_id); // StreamTextureFactory implementation. - virtual StreamTextureProxy* CreateProxy() OVERRIDE; - virtual void EstablishPeer(int32 stream_id, int player_id) OVERRIDE; + virtual StreamTextureProxy* CreateProxy() override; + virtual void EstablishPeer(int32 stream_id, int player_id) override; virtual unsigned CreateStreamTexture(unsigned texture_target, unsigned* texture_id, - gpu::Mailbox* texture_mailbox) OVERRIDE; + gpu::Mailbox* texture_mailbox) override; virtual void SetStreamTextureSize(int32 texture_id, - const gfx::Size& size) OVERRIDE; - virtual gpu::gles2::GLES2Interface* ContextGL() OVERRIDE; - virtual void AddObserver(StreamTextureFactoryContextObserver* obs) OVERRIDE; + const gfx::Size& size) override; + virtual gpu::gles2::GLES2Interface* ContextGL() override; + virtual void AddObserver(StreamTextureFactoryContextObserver* obs) override; virtual void RemoveObserver( - StreamTextureFactoryContextObserver* obs) OVERRIDE; + StreamTextureFactoryContextObserver* obs) override; private: friend class base::RefCounted<StreamTextureFactoryImpl>; diff --git a/content/renderer/media/android/stream_texture_factory_synchronous_impl.cc b/content/renderer/media/android/stream_texture_factory_synchronous_impl.cc index 57f6ec6..5c0fb59 100644 --- a/content/renderer/media/android/stream_texture_factory_synchronous_impl.cc +++ b/content/renderer/media/android/stream_texture_factory_synchronous_impl.cc @@ -36,8 +36,8 @@ class StreamTextureProxyImpl // StreamTextureProxy implementation: virtual void BindToLoop(int32 stream_id, cc::VideoFrameProvider::Client* client, - scoped_refptr<base::MessageLoopProxy> loop) OVERRIDE; - virtual void Release() OVERRIDE; + scoped_refptr<base::MessageLoopProxy> loop) override; + virtual void Release() override; private: void BindOnThread(int32 stream_id); diff --git a/content/renderer/media/android/stream_texture_factory_synchronous_impl.h b/content/renderer/media/android/stream_texture_factory_synchronous_impl.h index 460fce7..3f33bd3 100644 --- a/content/renderer/media/android/stream_texture_factory_synchronous_impl.h +++ b/content/renderer/media/android/stream_texture_factory_synchronous_impl.h @@ -47,17 +47,17 @@ class StreamTextureFactorySynchronousImpl : public StreamTextureFactory { const CreateContextProviderCallback& try_create_callback, int frame_id); - virtual StreamTextureProxy* CreateProxy() OVERRIDE; - virtual void EstablishPeer(int32 stream_id, int player_id) OVERRIDE; + virtual StreamTextureProxy* CreateProxy() override; + virtual void EstablishPeer(int32 stream_id, int player_id) override; virtual unsigned CreateStreamTexture(unsigned texture_target, unsigned* texture_id, - gpu::Mailbox* texture_mailbox) OVERRIDE; + gpu::Mailbox* texture_mailbox) override; virtual void SetStreamTextureSize(int32 stream_id, - const gfx::Size& size) OVERRIDE; - virtual gpu::gles2::GLES2Interface* ContextGL() OVERRIDE; - virtual void AddObserver(StreamTextureFactoryContextObserver* obs) OVERRIDE; + const gfx::Size& size) override; + virtual gpu::gles2::GLES2Interface* ContextGL() override; + virtual void AddObserver(StreamTextureFactoryContextObserver* obs) override; virtual void RemoveObserver( - StreamTextureFactoryContextObserver* obs) OVERRIDE; + StreamTextureFactoryContextObserver* obs) override; private: friend class base::RefCounted<StreamTextureFactorySynchronousImpl>; diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc index 539b726..2818bee 100644 --- a/content/renderer/media/android/webmediaplayer_android.cc +++ b/content/renderer/media/android/webmediaplayer_android.cc @@ -90,10 +90,10 @@ class SyncPointClientImpl : public media::VideoFrame::SyncPointClient { blink::WebGraphicsContext3D* web_graphics_context) : web_graphics_context_(web_graphics_context) {} virtual ~SyncPointClientImpl() {} - virtual uint32 InsertSyncPoint() OVERRIDE { + virtual uint32 InsertSyncPoint() override { return web_graphics_context_->insertSyncPoint(); } - virtual void WaitSyncPoint(uint32 sync_point) OVERRIDE { + virtual void WaitSyncPoint(uint32 sync_point) override { web_graphics_context_->waitSyncPoint(sync_point); } diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h index 92a94a3..4321733 100644 --- a/content/renderer/media/android/webmediaplayer_android.h +++ b/content/renderer/media/android/webmediaplayer_android.h @@ -115,7 +115,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, virtual blink::WebTimeRanges seekable() const; // Poster image, as defined in the <video> element. - virtual void setPoster(const blink::WebURL& poster) OVERRIDE; + virtual void setPoster(const blink::WebURL& poster) override; // Methods for painting. // FIXME: This path "only works" on Android. It is a workaround for the @@ -174,10 +174,10 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, // cc::VideoFrameProvider implementation. These methods are running on the // compositor thread. virtual void SetVideoFrameProviderClient( - cc::VideoFrameProvider::Client* client) OVERRIDE; - virtual scoped_refptr<media::VideoFrame> GetCurrentFrame() OVERRIDE; + cc::VideoFrameProvider::Client* client) override; + virtual scoped_refptr<media::VideoFrame> GetCurrentFrame() override; virtual void PutCurrentFrame(const scoped_refptr<media::VideoFrame>& frame) - OVERRIDE; + override; // Media player callback handlers. void OnMediaMetadataChanged(const base::TimeDelta& duration, int width, @@ -205,7 +205,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, void OnRemoteRouteAvailabilityChanged(bool routes_available); // StreamTextureFactoryContextObserver implementation. - virtual void ResetStreamTextureProxy() OVERRIDE; + virtual void ResetStreamTextureProxy() override; // Called when the player is released. virtual void OnPlayerReleased(); @@ -216,7 +216,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, virtual void ReleaseMediaResources(); // RenderFrameObserver implementation. - virtual void OnDestruct() OVERRIDE; + virtual void OnDestruct() override; #if defined(VIDEO_HOLE) // Calculate the boundary rectangle of the media player (i.e. location and diff --git a/content/renderer/media/audio_input_message_filter.cc b/content/renderer/media/audio_input_message_filter.cc index 171ddf8..e96b874 100644 --- a/content/renderer/media/audio_input_message_filter.cc +++ b/content/renderer/media/audio_input_message_filter.cc @@ -39,10 +39,10 @@ class AudioInputMessageFilter::AudioInputIPCImpl int session_id, const media::AudioParameters& params, bool automatic_gain_control, - uint32 total_segments) OVERRIDE; - virtual void RecordStream() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual void CloseStream() OVERRIDE; + uint32 total_segments) override; + virtual void RecordStream() override; + virtual void SetVolume(double volume) override; + virtual void CloseStream() override; private: const scoped_refptr<AudioInputMessageFilter> filter_; diff --git a/content/renderer/media/audio_input_message_filter.h b/content/renderer/media/audio_input_message_filter.h index 1107463..cc49d94 100644 --- a/content/renderer/media/audio_input_message_filter.h +++ b/content/renderer/media/audio_input_message_filter.h @@ -53,10 +53,10 @@ class CONTENT_EXPORT AudioInputMessageFilter : public IPC::MessageFilter { void Send(IPC::Message* message); // IPC::MessageFilter override. Called on |io_message_loop_|. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE; - virtual void OnFilterRemoved() OVERRIDE; - virtual void OnChannelClosing() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void OnFilterAdded(IPC::Sender* sender) override; + virtual void OnFilterRemoved() override; + virtual void OnChannelClosing() override; // Received when browser process has created an audio input stream. void OnStreamCreated(int stream_id, diff --git a/content/renderer/media/audio_message_filter.cc b/content/renderer/media/audio_message_filter.cc index 09f3689..f72ae54 100644 --- a/content/renderer/media/audio_message_filter.cc +++ b/content/renderer/media/audio_message_filter.cc @@ -29,11 +29,11 @@ class AudioMessageFilter::AudioOutputIPCImpl // media::AudioOutputIPC implementation. virtual void CreateStream(media::AudioOutputIPCDelegate* delegate, const media::AudioParameters& params, - int session_id) OVERRIDE; - virtual void PlayStream() OVERRIDE; - virtual void PauseStream() OVERRIDE; - virtual void CloseStream() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; + int session_id) override; + virtual void PlayStream() override; + virtual void PauseStream() override; + virtual void CloseStream() override; + virtual void SetVolume(double volume) override; private: const scoped_refptr<AudioMessageFilter> filter_; diff --git a/content/renderer/media/audio_message_filter.h b/content/renderer/media/audio_message_filter.h index e644575..2783c72 100644 --- a/content/renderer/media/audio_message_filter.h +++ b/content/renderer/media/audio_message_filter.h @@ -69,10 +69,10 @@ class CONTENT_EXPORT AudioMessageFilter : public IPC::MessageFilter { void Send(IPC::Message* message); // IPC::MessageFilter override. Called on |io_message_loop|. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE; - virtual void OnFilterRemoved() OVERRIDE; - virtual void OnChannelClosing() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void OnFilterAdded(IPC::Sender* sender) override; + virtual void OnFilterRemoved() override; + virtual void OnChannelClosing() override; // Received when browser process has created an audio output stream. void OnStreamCreated(int stream_id, base::SharedMemoryHandle handle, diff --git a/content/renderer/media/audio_message_filter_unittest.cc b/content/renderer/media/audio_message_filter_unittest.cc index 81ba88e..9036b32c 100644 --- a/content/renderer/media/audio_message_filter_unittest.cc +++ b/content/renderer/media/audio_message_filter_unittest.cc @@ -21,20 +21,20 @@ class MockAudioDelegate : public media::AudioOutputIPCDelegate { } virtual void OnStateChanged( - media::AudioOutputIPCDelegate::State state) OVERRIDE { + media::AudioOutputIPCDelegate::State state) override { state_changed_received_ = true; state_ = state; } virtual void OnStreamCreated(base::SharedMemoryHandle handle, base::SyncSocket::Handle, - int length) OVERRIDE { + int length) override { created_received_ = true; handle_ = handle; length_ = length; } - virtual void OnIPCClosed() OVERRIDE {} + virtual void OnIPCClosed() override {} void Reset() { state_changed_received_ = false; diff --git a/content/renderer/media/crypto/encrypted_media_player_support_impl.h b/content/renderer/media/crypto/encrypted_media_player_support_impl.h index 788747f4..6943d44 100644 --- a/content/renderer/media/crypto/encrypted_media_player_support_impl.h +++ b/content/renderer/media/crypto/encrypted_media_player_support_impl.h @@ -34,7 +34,7 @@ class EncryptedMediaPlayerSupportImpl blink::WebLocalFrame* frame, const blink::WebString& key_system, const unsigned char* init_data, - unsigned init_data_length) OVERRIDE; + unsigned init_data_length) override; virtual blink::WebMediaPlayer::MediaKeyException AddKey( const blink::WebString& key_system, @@ -42,25 +42,25 @@ class EncryptedMediaPlayerSupportImpl unsigned key_length, const unsigned char* init_data, unsigned init_data_length, - const blink::WebString& session_id) OVERRIDE; + const blink::WebString& session_id) override; virtual blink::WebMediaPlayer::MediaKeyException CancelKeyRequest( const blink::WebString& key_system, - const blink::WebString& session_id) OVERRIDE; + const blink::WebString& session_id) override; virtual void SetInitialContentDecryptionModule( - blink::WebContentDecryptionModule* initial_cdm) OVERRIDE; + blink::WebContentDecryptionModule* initial_cdm) override; virtual void SetContentDecryptionModule( - blink::WebContentDecryptionModule* cdm) OVERRIDE; + blink::WebContentDecryptionModule* cdm) override; virtual void SetContentDecryptionModule( blink::WebContentDecryptionModule* cdm, - blink::WebContentDecryptionModuleResult result) OVERRIDE; + blink::WebContentDecryptionModuleResult result) override; - virtual media::SetDecryptorReadyCB CreateSetDecryptorReadyCB() OVERRIDE; - virtual media::Demuxer::NeedKeyCB CreateNeedKeyCB() OVERRIDE; + virtual media::SetDecryptorReadyCB CreateSetDecryptorReadyCB() override; + virtual media::Demuxer::NeedKeyCB CreateNeedKeyCB() override; - virtual void OnPipelineDecryptError() OVERRIDE; + virtual void OnPipelineDecryptError() override; private: explicit EncryptedMediaPlayerSupportImpl(blink::WebMediaPlayerClient* client); diff --git a/content/renderer/media/crypto/key_systems_unittest.cc b/content/renderer/media/crypto/key_systems_unittest.cc index d15b730..f2657ab 100644 --- a/content/renderer/media/crypto/key_systems_unittest.cc +++ b/content/renderer/media/crypto/key_systems_unittest.cc @@ -93,7 +93,7 @@ static void AddContainerAndCodecMasksForTest() { class TestContentRendererClient : public ContentRendererClient { virtual void AddKeySystems( - std::vector<content::KeySystemInfo>* key_systems) OVERRIDE; + std::vector<content::KeySystemInfo>* key_systems) override; }; void TestContentRendererClient::AddKeySystems( @@ -163,7 +163,7 @@ class KeySystemsTest : public testing::Test { SetRendererClientForTesting(&content_renderer_client_); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AddContainerAndCodecMasksForTest(); } diff --git a/content/renderer/media/crypto/pepper_cdm_wrapper_impl.h b/content/renderer/media/crypto/pepper_cdm_wrapper_impl.h index 7f54f0c..38e53c9 100644 --- a/content/renderer/media/crypto/pepper_cdm_wrapper_impl.h +++ b/content/renderer/media/crypto/pepper_cdm_wrapper_impl.h @@ -47,7 +47,7 @@ class PepperCdmWrapperImpl : public PepperCdmWrapper { virtual ~PepperCdmWrapperImpl(); // Returns the ContentDecryptorDelegate* associated with this plugin. - virtual ContentDecryptorDelegate* GetCdmDelegate() OVERRIDE; + virtual ContentDecryptorDelegate* GetCdmDelegate() override; private: typedef scoped_ptr<blink::WebHelperPlugin, WebHelperPluginDeleter> diff --git a/content/renderer/media/crypto/ppapi_decryptor.h b/content/renderer/media/crypto/ppapi_decryptor.h index 4f215e1..b567d45 100644 --- a/content/renderer/media/crypto/ppapi_decryptor.h +++ b/content/renderer/media/crypto/ppapi_decryptor.h @@ -48,51 +48,51 @@ class PpapiDecryptor : public media::MediaKeys, public media::Decryptor { virtual void SetServerCertificate( const uint8* certificate_data, int certificate_data_length, - scoped_ptr<media::SimpleCdmPromise> promise) OVERRIDE; + scoped_ptr<media::SimpleCdmPromise> promise) override; virtual void CreateSession( const std::string& init_data_type, const uint8* init_data, int init_data_length, SessionType session_type, - scoped_ptr<media::NewSessionCdmPromise> promise) OVERRIDE; + scoped_ptr<media::NewSessionCdmPromise> promise) override; virtual void LoadSession( const std::string& web_session_id, - scoped_ptr<media::NewSessionCdmPromise> promise) OVERRIDE; + scoped_ptr<media::NewSessionCdmPromise> promise) override; virtual void UpdateSession( const std::string& web_session_id, const uint8* response, int response_length, - scoped_ptr<media::SimpleCdmPromise> promise) OVERRIDE; + scoped_ptr<media::SimpleCdmPromise> promise) override; virtual void CloseSession( const std::string& web_session_id, - scoped_ptr<media::SimpleCdmPromise> promise) OVERRIDE; + scoped_ptr<media::SimpleCdmPromise> promise) override; virtual void RemoveSession( const std::string& web_session_id, - scoped_ptr<media::SimpleCdmPromise> promise) OVERRIDE; + scoped_ptr<media::SimpleCdmPromise> promise) override; virtual void GetUsableKeyIds( const std::string& web_session_id, - scoped_ptr<media::KeyIdsPromise> promise) OVERRIDE; - virtual Decryptor* GetDecryptor() OVERRIDE; + scoped_ptr<media::KeyIdsPromise> promise) override; + virtual Decryptor* GetDecryptor() override; // media::Decryptor implementation. virtual void RegisterNewKeyCB(StreamType stream_type, - const NewKeyCB& key_added_cb) OVERRIDE; + const NewKeyCB& key_added_cb) override; virtual void Decrypt(StreamType stream_type, const scoped_refptr<media::DecoderBuffer>& encrypted, - const DecryptCB& decrypt_cb) OVERRIDE; - virtual void CancelDecrypt(StreamType stream_type) OVERRIDE; + const DecryptCB& decrypt_cb) override; + virtual void CancelDecrypt(StreamType stream_type) override; virtual void InitializeAudioDecoder(const media::AudioDecoderConfig& config, - const DecoderInitCB& init_cb) OVERRIDE; + const DecoderInitCB& init_cb) override; virtual void InitializeVideoDecoder(const media::VideoDecoderConfig& config, - const DecoderInitCB& init_cb) OVERRIDE; + const DecoderInitCB& init_cb) override; virtual void DecryptAndDecodeAudio( const scoped_refptr<media::DecoderBuffer>& encrypted, - const AudioDecodeCB& audio_decode_cb) OVERRIDE; + const AudioDecodeCB& audio_decode_cb) override; virtual void DecryptAndDecodeVideo( const scoped_refptr<media::DecoderBuffer>& encrypted, - const VideoDecodeCB& video_decode_cb) OVERRIDE; - virtual void ResetDecoder(StreamType stream_type) OVERRIDE; - virtual void DeinitializeDecoder(StreamType stream_type) OVERRIDE; + const VideoDecodeCB& video_decode_cb) override; + virtual void ResetDecoder(StreamType stream_type) override; + virtual void DeinitializeDecoder(StreamType stream_type) override; private: PpapiDecryptor( diff --git a/content/renderer/media/crypto/proxy_media_keys.h b/content/renderer/media/crypto/proxy_media_keys.h index c0c790e..bb08a5f 100644 --- a/content/renderer/media/crypto/proxy_media_keys.h +++ b/content/renderer/media/crypto/proxy_media_keys.h @@ -40,30 +40,30 @@ class ProxyMediaKeys : public media::MediaKeys { virtual void SetServerCertificate( const uint8* certificate_data, int certificate_data_length, - scoped_ptr<media::SimpleCdmPromise> promise) OVERRIDE; + scoped_ptr<media::SimpleCdmPromise> promise) override; virtual void CreateSession( const std::string& init_data_type, const uint8* init_data, int init_data_length, SessionType session_type, - scoped_ptr<media::NewSessionCdmPromise> promise) OVERRIDE; + scoped_ptr<media::NewSessionCdmPromise> promise) override; virtual void LoadSession( const std::string& web_session_id, - scoped_ptr<media::NewSessionCdmPromise> promise) OVERRIDE; + scoped_ptr<media::NewSessionCdmPromise> promise) override; virtual void UpdateSession( const std::string& web_session_id, const uint8* response, int response_length, - scoped_ptr<media::SimpleCdmPromise> promise) OVERRIDE; + scoped_ptr<media::SimpleCdmPromise> promise) override; virtual void CloseSession( const std::string& web_session_id, - scoped_ptr<media::SimpleCdmPromise> promise) OVERRIDE; + scoped_ptr<media::SimpleCdmPromise> promise) override; virtual void RemoveSession( const std::string& web_session_id, - scoped_ptr<media::SimpleCdmPromise> promise) OVERRIDE; + scoped_ptr<media::SimpleCdmPromise> promise) override; virtual void GetUsableKeyIds( const std::string& web_session_id, - scoped_ptr<media::KeyIdsPromise> promise) OVERRIDE; + scoped_ptr<media::KeyIdsPromise> promise) override; // Callbacks. void OnSessionCreated(uint32 session_id, const std::string& web_session_id); diff --git a/content/renderer/media/crypto/renderer_cdm_manager.h b/content/renderer/media/crypto/renderer_cdm_manager.h index a5ff82f..8fae04c 100644 --- a/content/renderer/media/crypto/renderer_cdm_manager.h +++ b/content/renderer/media/crypto/renderer_cdm_manager.h @@ -33,7 +33,7 @@ class RendererCdmManager : public RenderFrameObserver { virtual ~RendererCdmManager(); // RenderFrameObserver overrides. - virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& msg) override; // Encrypted media related methods. void InitializeCdm(int cdm_id, diff --git a/content/renderer/media/media_stream_audio_processor.h b/content/renderer/media/media_stream_audio_processor.h index 3c44f80..40abb4e 100644 --- a/content/renderer/media/media_stream_audio_processor.h +++ b/content/renderer/media/media_stream_audio_processor.h @@ -108,9 +108,9 @@ class CONTENT_EXPORT MediaStreamAudioProcessor : // AecDumpMessageFilter::AecDumpDelegate implementation. // Called on the main render thread. virtual void OnAecDumpFile( - const IPC::PlatformFileForTransit& file_handle) OVERRIDE; - virtual void OnDisableAecDump() OVERRIDE; - virtual void OnIpcClosing() OVERRIDE; + const IPC::PlatformFileForTransit& file_handle) override; + virtual void OnDisableAecDump() override; + virtual void OnIpcClosing() override; protected: friend class base::RefCountedThreadSafe<MediaStreamAudioProcessor>; @@ -124,12 +124,12 @@ class CONTENT_EXPORT MediaStreamAudioProcessor : // WebRtcPlayoutDataSource::Sink implementation. virtual void OnPlayoutData(media::AudioBus* audio_bus, int sample_rate, - int audio_delay_milliseconds) OVERRIDE; - virtual void OnPlayoutDataSourceChanged() OVERRIDE; + int audio_delay_milliseconds) override; + virtual void OnPlayoutDataSourceChanged() override; // webrtc::AudioProcessorInterface implementation. // This method is called on the libjingle thread. - virtual void GetStats(AudioProcessorStats* stats) OVERRIDE; + virtual void GetStats(AudioProcessorStats* stats) override; // Helper to initialize the WebRtc AudioProcessing. void InitializeAudioProcessingModule( diff --git a/content/renderer/media/media_stream_audio_sink_owner.h b/content/renderer/media/media_stream_audio_sink_owner.h index 6fcabbd..40c931d 100644 --- a/content/renderer/media/media_stream_audio_sink_owner.h +++ b/content/renderer/media/media_stream_audio_sink_owner.h @@ -28,13 +28,13 @@ class MediaStreamAudioSinkOwner : public MediaStreamAudioTrackSink { int audio_delay_milliseconds, int current_volume, bool need_audio_processing, - bool key_pressed) OVERRIDE; - virtual void OnSetFormat(const media::AudioParameters& params) OVERRIDE; + bool key_pressed) override; + virtual void OnSetFormat(const media::AudioParameters& params) override; virtual void OnReadyStateChanged( - blink::WebMediaStreamSource::ReadyState state) OVERRIDE; - virtual void Reset() OVERRIDE; - virtual bool IsEqual(const MediaStreamAudioSink* other) const OVERRIDE; - virtual bool IsEqual(const PeerConnectionAudioSink* other) const OVERRIDE; + blink::WebMediaStreamSource::ReadyState state) override; + virtual void Reset() override; + virtual bool IsEqual(const MediaStreamAudioSink* other) const override; + virtual bool IsEqual(const PeerConnectionAudioSink* other) const override; protected: virtual ~MediaStreamAudioSinkOwner() {} diff --git a/content/renderer/media/media_stream_audio_source.h b/content/renderer/media/media_stream_audio_source.h index 66e30c1..bad08f3 100644 --- a/content/renderer/media/media_stream_audio_source.h +++ b/content/renderer/media/media_stream_audio_source.h @@ -46,7 +46,7 @@ class CONTENT_EXPORT MediaStreamAudioSource } protected: - virtual void DoStopSource() OVERRIDE; + virtual void DoStopSource() override; private: const int render_view_id_; // Render view ID that created this source. diff --git a/content/renderer/media/media_stream_center.h b/content/renderer/media/media_stream_center.h index d2dfa98..e60ff5b 100644 --- a/content/renderer/media/media_stream_center.h +++ b/content/renderer/media/media_stream_center.h @@ -35,41 +35,41 @@ class CONTENT_EXPORT MediaStreamCenter private: virtual bool getMediaStreamTrackSources( - const blink::WebMediaStreamTrackSourcesRequest& request) OVERRIDE; + const blink::WebMediaStreamTrackSourcesRequest& request) override; virtual void didCreateMediaStreamTrack( - const blink::WebMediaStreamTrack& track) OVERRIDE; + const blink::WebMediaStreamTrack& track) override; virtual void didEnableMediaStreamTrack( - const blink::WebMediaStreamTrack& track) OVERRIDE; + const blink::WebMediaStreamTrack& track) override; virtual void didDisableMediaStreamTrack( - const blink::WebMediaStreamTrack& track) OVERRIDE; + const blink::WebMediaStreamTrack& track) override; virtual void didStopLocalMediaStream( - const blink::WebMediaStream& stream) OVERRIDE; + const blink::WebMediaStream& stream) override; virtual bool didStopMediaStreamTrack( - const blink::WebMediaStreamTrack& track) OVERRIDE; + const blink::WebMediaStreamTrack& track) override; virtual blink::WebAudioSourceProvider* createWebAudioSourceFromMediaStreamTrack( - const blink::WebMediaStreamTrack& track) OVERRIDE; + const blink::WebMediaStreamTrack& track) override; virtual void didCreateMediaStream( - blink::WebMediaStream& stream) OVERRIDE; + blink::WebMediaStream& stream) override; virtual bool didAddMediaStreamTrack( const blink::WebMediaStream& stream, - const blink::WebMediaStreamTrack& track) OVERRIDE; + const blink::WebMediaStreamTrack& track) override; virtual bool didRemoveMediaStreamTrack( const blink::WebMediaStream& stream, - const blink::WebMediaStreamTrack& track) OVERRIDE; + const blink::WebMediaStreamTrack& track) override; // RenderProcessObserver implementation. - virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnControlMessageReceived(const IPC::Message& message) override; void OnGetSourcesComplete(int request_id, const content::StreamDeviceInfoArray& devices); diff --git a/content/renderer/media/media_stream_dispatcher.h b/content/renderer/media/media_stream_dispatcher.h index 799c2dd..41410ac 100644 --- a/content/renderer/media/media_stream_dispatcher.h +++ b/content/renderer/media/media_stream_dispatcher.h @@ -110,10 +110,10 @@ class CONTENT_EXPORT MediaStreamDispatcher // opened it. struct Stream; - // RenderFrameObserver OVERRIDE. - virtual void OnDestruct() OVERRIDE; - virtual bool Send(IPC::Message* message) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + // RenderFrameObserver override. + virtual void OnDestruct() override; + virtual bool Send(IPC::Message* message) override; + virtual bool OnMessageReceived(const IPC::Message& message) override; // Messages from the browser. void OnStreamGenerated( diff --git a/content/renderer/media/media_stream_dispatcher_unittest.cc b/content/renderer/media/media_stream_dispatcher_unittest.cc index 85fe8d8..ccf6fd5 100644 --- a/content/renderer/media/media_stream_dispatcher_unittest.cc +++ b/content/renderer/media/media_stream_dispatcher_unittest.cc @@ -41,7 +41,7 @@ class MockMediaStreamDispatcherEventHandler int request_id, const std::string &label, const StreamDeviceInfoArray& audio_device_array, - const StreamDeviceInfoArray& video_device_array) OVERRIDE { + const StreamDeviceInfoArray& video_device_array) override { request_id_ = request_id; label_ = label; if (audio_device_array.size()) { @@ -56,12 +56,12 @@ class MockMediaStreamDispatcherEventHandler virtual void OnStreamGenerationFailed( int request_id, - content::MediaStreamRequestResult result) OVERRIDE { + content::MediaStreamRequestResult result) override { request_id_ = request_id; } virtual void OnDeviceStopped(const std::string& label, - const StreamDeviceInfo& device_info) OVERRIDE { + const StreamDeviceInfo& device_info) override { device_stopped_label_ = label; if (IsVideoMediaType(device_info.device.type)) { EXPECT_TRUE(StreamDeviceInfo::IsEqual(video_device_, device_info)); @@ -73,19 +73,19 @@ class MockMediaStreamDispatcherEventHandler virtual void OnDevicesEnumerated( int request_id, - const StreamDeviceInfoArray& device_array) OVERRIDE { + const StreamDeviceInfoArray& device_array) override { request_id_ = request_id; } virtual void OnDeviceOpened( int request_id, const std::string& label, - const StreamDeviceInfo& video_device) OVERRIDE { + const StreamDeviceInfo& video_device) override { request_id_ = request_id; label_ = label; } - virtual void OnDeviceOpenFailed(int request_id) OVERRIDE { + virtual void OnDeviceOpenFailed(int request_id) override { request_id_ = request_id; } diff --git a/content/renderer/media/media_stream_video_capture_source_unittest.cc b/content/renderer/media/media_stream_video_capture_source_unittest.cc index 6a3f2aa..926a57c 100644 --- a/content/renderer/media/media_stream_video_capture_source_unittest.cc +++ b/content/renderer/media/media_stream_video_capture_source_unittest.cc @@ -42,7 +42,7 @@ class MediaStreamVideoCapturerSourceTest : public testing::Test { source_stopped_(false) { } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { webkit_source_.reset(); blink::WebHeap::collectAllGarbageForTesting(); } diff --git a/content/renderer/media/media_stream_video_capturer_source.h b/content/renderer/media/media_stream_video_capturer_source.h index d33088a..6d27eb0 100644 --- a/content/renderer/media/media_stream_video_capturer_source.h +++ b/content/renderer/media/media_stream_video_capturer_source.h @@ -104,13 +104,13 @@ class CONTENT_EXPORT MediaStreamVideoCapturerSource int max_requested_width, int max_requested_height, double max_requested_frame_rate, - const VideoCaptureDeviceFormatsCB& callback) OVERRIDE; + const VideoCaptureDeviceFormatsCB& callback) override; virtual void StartSourceImpl( const media::VideoCaptureFormat& format, - const VideoCaptureDeliverFrameCB& frame_callback) OVERRIDE; + const VideoCaptureDeliverFrameCB& frame_callback) override; - virtual void StopSourceImpl() OVERRIDE; + virtual void StopSourceImpl() override; private: // The delegate that provides video frames. diff --git a/content/renderer/media/media_stream_video_source.h b/content/renderer/media/media_stream_video_source.h index d1ceeef..4ff7594 100644 --- a/content/renderer/media/media_stream_video_source.h +++ b/content/renderer/media/media_stream_video_source.h @@ -84,7 +84,7 @@ class CONTENT_EXPORT MediaStreamVideoSource static const int kUnknownFrameRate; protected: - virtual void DoStopSource() OVERRIDE; + virtual void DoStopSource() override; // Sets ready state and notifies the ready state to all registered tracks. virtual void SetReadyState(blink::WebMediaStreamSource::ReadyState state); diff --git a/content/renderer/media/media_stream_video_track.h b/content/renderer/media/media_stream_video_track.h index 874c298..de128b5 100644 --- a/content/renderer/media/media_stream_video_track.h +++ b/content/renderer/media/media_stream_video_track.h @@ -49,9 +49,9 @@ class CONTENT_EXPORT MediaStreamVideoTrack : public MediaStreamTrack { bool enabled); virtual ~MediaStreamVideoTrack(); - virtual void SetEnabled(bool enabled) OVERRIDE; + virtual void SetEnabled(bool enabled) override; - virtual void Stop() OVERRIDE; + virtual void Stop() override; void OnReadyStateChanged(blink::WebMediaStreamSource::ReadyState state); diff --git a/content/renderer/media/media_stream_video_track_unittest.cc b/content/renderer/media/media_stream_video_track_unittest.cc index 51055ea..caf5567 100644 --- a/content/renderer/media/media_stream_video_track_unittest.cc +++ b/content/renderer/media/media_stream_video_track_unittest.cc @@ -41,7 +41,7 @@ class MediaStreamVideoTrackTest : public ::testing::Test { virtual ~MediaStreamVideoTrackTest() { } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { blink_source_.reset(); blink::WebHeap::collectAllGarbageForTesting(); } diff --git a/content/renderer/media/midi_dispatcher.h b/content/renderer/media/midi_dispatcher.h index 0d40f46..b37085e 100644 --- a/content/renderer/media/midi_dispatcher.h +++ b/content/renderer/media/midi_dispatcher.h @@ -28,7 +28,7 @@ class MidiDispatcher : public RenderFrameObserver, private: // RenderFrameObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // blink::WebMIDIClient implementation. virtual void requestSysexPermission( diff --git a/content/renderer/media/midi_message_filter.h b/content/renderer/media/midi_message_filter.h index e8de64d..8eed8ab 100644 --- a/content/renderer/media/midi_message_filter.h +++ b/content/renderer/media/midi_message_filter.h @@ -54,10 +54,10 @@ class CONTENT_EXPORT MidiMessageFilter : public IPC::MessageFilter { void Send(IPC::Message* message); // IPC::MessageFilter override. Called on |io_message_loop|. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE; - virtual void OnFilterRemoved() OVERRIDE; - virtual void OnChannelClosing() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void OnFilterAdded(IPC::Sender* sender) override; + virtual void OnFilterRemoved() override; + virtual void OnChannelClosing() override; // Called when the browser process has approved (or denied) access to // MIDI hardware. diff --git a/content/renderer/media/mock_media_stream_dispatcher.h b/content/renderer/media/mock_media_stream_dispatcher.h index 349aa3c..e5f9129 100644 --- a/content/renderer/media/mock_media_stream_dispatcher.h +++ b/content/renderer/media/mock_media_stream_dispatcher.h @@ -22,20 +22,20 @@ class MockMediaStreamDispatcher : public MediaStreamDispatcher { int request_id, const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler, const StreamOptions& components, - const GURL& url) OVERRIDE; + const GURL& url) override; virtual void CancelGenerateStream( int request_id, const base::WeakPtr<MediaStreamDispatcherEventHandler>& - event_handler) OVERRIDE; + event_handler) override; virtual void EnumerateDevices( int request_id, const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler, MediaStreamType type, - const GURL& security_origin) OVERRIDE; - virtual void StopStreamDevice(const StreamDeviceInfo& device_info) OVERRIDE; - virtual bool IsStream(const std::string& label) OVERRIDE; - virtual int video_session_id(const std::string& label, int index) OVERRIDE; - virtual int audio_session_id(const std::string& label, int index) OVERRIDE; + const GURL& security_origin) override; + virtual void StopStreamDevice(const StreamDeviceInfo& device_info) override; + virtual bool IsStream(const std::string& label) override; + virtual int video_session_id(const std::string& label, int index) override; + virtual int audio_session_id(const std::string& label, int index) override; int audio_input_request_id() const { return audio_input_request_id_; } int audio_output_request_id() const { return audio_output_request_id_; } diff --git a/content/renderer/media/mock_media_stream_registry.h b/content/renderer/media/mock_media_stream_registry.h index ac0ffa1..9342323 100644 --- a/content/renderer/media/mock_media_stream_registry.h +++ b/content/renderer/media/mock_media_stream_registry.h @@ -19,7 +19,7 @@ class MockMediaStreamRegistry : public MediaStreamRegistryInterface { void Init(const std::string& stream_label); void AddVideoTrack(const std::string& track_id); virtual blink::WebMediaStream GetMediaStream( - const std::string& url) OVERRIDE; + const std::string& url) override; const blink::WebMediaStream test_stream() const; diff --git a/content/renderer/media/mock_media_stream_video_sink.h b/content/renderer/media/mock_media_stream_video_sink.h index 2f73761..eeb976a 100644 --- a/content/renderer/media/mock_media_stream_video_sink.h +++ b/content/renderer/media/mock_media_stream_video_sink.h @@ -20,8 +20,8 @@ class MockMediaStreamVideoSink : public MediaStreamVideoSink { virtual ~MockMediaStreamVideoSink(); virtual void OnReadyStateChanged( - blink::WebMediaStreamSource::ReadyState state) OVERRIDE; - virtual void OnEnabledChanged(bool enabled) OVERRIDE; + blink::WebMediaStreamSource::ReadyState state) override; + virtual void OnEnabledChanged(bool enabled) override; // Triggered when OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame) // is called. diff --git a/content/renderer/media/mock_media_stream_video_source.h b/content/renderer/media/mock_media_stream_video_source.h index ff70fb5..9602b2f 100644 --- a/content/renderer/media/mock_media_stream_video_source.h +++ b/content/renderer/media/mock_media_stream_video_source.h @@ -44,7 +44,7 @@ class MockMediaStreamVideoSource : public MediaStreamVideoSource { int max_requested_width() const { return max_requested_width_; } double max_requested_frame_rate() const { return max_requested_frame_rate_; } - virtual void SetMutedState(bool muted_state) OVERRIDE { + virtual void SetMutedState(bool muted_state) override { MediaStreamVideoSource::SetMutedState(muted_state); DoSetMutedState(muted_state); } @@ -60,11 +60,11 @@ class MockMediaStreamVideoSource : public MediaStreamVideoSource { int max_requested_height, int max_requested_width, double max_requested_frame_rate, - const VideoCaptureDeviceFormatsCB& callback) OVERRIDE; + const VideoCaptureDeviceFormatsCB& callback) override; virtual void StartSourceImpl( const media::VideoCaptureFormat& format, - const VideoCaptureDeliverFrameCB& frame_callback) OVERRIDE; - virtual void StopSourceImpl() OVERRIDE; + const VideoCaptureDeliverFrameCB& frame_callback) override; + virtual void StopSourceImpl() override; private: media::VideoCaptureFormat format_; diff --git a/content/renderer/media/mock_peer_connection_impl.cc b/content/renderer/media/mock_peer_connection_impl.cc index d21e134..a2b13215 100644 --- a/content/renderer/media/mock_peer_connection_impl.cc +++ b/content/renderer/media/mock_peer_connection_impl.cc @@ -25,13 +25,13 @@ namespace content { class MockStreamCollection : public webrtc::StreamCollectionInterface { public: - virtual size_t count() OVERRIDE { + virtual size_t count() override { return streams_.size(); } - virtual MediaStreamInterface* at(size_t index) OVERRIDE { + virtual MediaStreamInterface* at(size_t index) override { return streams_[index]; } - virtual MediaStreamInterface* find(const std::string& label) OVERRIDE { + virtual MediaStreamInterface* find(const std::string& label) override { for (size_t i = 0; i < streams_.size(); ++i) { if (streams_[i]->label() == label) return streams_[i]; @@ -39,7 +39,7 @@ class MockStreamCollection : public webrtc::StreamCollectionInterface { return NULL; } virtual webrtc::MediaStreamTrackInterface* FindAudioTrack( - const std::string& id) OVERRIDE { + const std::string& id) override { for (size_t i = 0; i < streams_.size(); ++i) { webrtc::MediaStreamTrackInterface* track = streams_.at(i)->FindAudioTrack(id); @@ -49,7 +49,7 @@ class MockStreamCollection : public webrtc::StreamCollectionInterface { return NULL; } virtual webrtc::MediaStreamTrackInterface* FindVideoTrack( - const std::string& id) OVERRIDE { + const std::string& id) override { for (size_t i = 0; i < streams_.size(); ++i) { webrtc::MediaStreamTrackInterface* track = streams_.at(i)->FindVideoTrack(id); @@ -91,59 +91,59 @@ class MockDataChannel : public webrtc::DataChannelInterface { } virtual void RegisterObserver( - webrtc::DataChannelObserver* observer) OVERRIDE { + webrtc::DataChannelObserver* observer) override { } - virtual void UnregisterObserver() OVERRIDE { + virtual void UnregisterObserver() override { } - virtual std::string label() const OVERRIDE { + virtual std::string label() const override { return label_; } - virtual bool reliable() const OVERRIDE { + virtual bool reliable() const override { return reliable_; } - virtual bool ordered() const OVERRIDE { + virtual bool ordered() const override { return config_.ordered; } - virtual unsigned short maxRetransmitTime() const OVERRIDE { + virtual unsigned short maxRetransmitTime() const override { return config_.maxRetransmitTime; } - virtual unsigned short maxRetransmits() const OVERRIDE { + virtual unsigned short maxRetransmits() const override { return config_.maxRetransmits; } - virtual std::string protocol() const OVERRIDE { + virtual std::string protocol() const override { return config_.protocol; } - virtual bool negotiated() const OVERRIDE { + virtual bool negotiated() const override { return config_.negotiated; } - virtual int id() const OVERRIDE { + virtual int id() const override { NOTIMPLEMENTED(); return 0; } - virtual DataState state() const OVERRIDE { + virtual DataState state() const override { return state_; } - virtual uint64 buffered_amount() const OVERRIDE { + virtual uint64 buffered_amount() const override { NOTIMPLEMENTED(); return 0; } - virtual void Close() OVERRIDE { + virtual void Close() override { state_ = webrtc::DataChannelInterface::kClosing; } - virtual bool Send(const webrtc::DataBuffer& buffer) OVERRIDE { + virtual bool Send(const webrtc::DataBuffer& buffer) override { return state_ == webrtc::DataChannelInterface::kOpen; } @@ -165,30 +165,30 @@ class MockDtmfSender : public DtmfSenderInterface { duration_(0), inter_tone_gap_(0) {} virtual void RegisterObserver( - DtmfSenderObserverInterface* observer) OVERRIDE { + DtmfSenderObserverInterface* observer) override { observer_ = observer; } - virtual void UnregisterObserver() OVERRIDE { + virtual void UnregisterObserver() override { observer_ = NULL; } - virtual bool CanInsertDtmf() OVERRIDE { + virtual bool CanInsertDtmf() override { return true; } virtual bool InsertDtmf(const std::string& tones, int duration, - int inter_tone_gap) OVERRIDE { + int inter_tone_gap) override { tones_ = tones; duration_ = duration; inter_tone_gap_ = inter_tone_gap; return true; } - virtual const AudioTrackInterface* track() const OVERRIDE { + virtual const AudioTrackInterface* track() const override { return track_.get(); } - virtual std::string tones() const OVERRIDE { + virtual std::string tones() const override { return tones_; } - virtual int duration() const OVERRIDE { return duration_; } - virtual int inter_tone_gap() const OVERRIDE { return inter_tone_gap_; } + virtual int duration() const override { return duration_; } + virtual int inter_tone_gap() const override { return inter_tone_gap_; } protected: virtual ~MockDtmfSender() {} diff --git a/content/renderer/media/mock_peer_connection_impl.h b/content/renderer/media/mock_peer_connection_impl.h index 0d7a847..33d323d 100644 --- a/content/renderer/media/mock_peer_connection_impl.h +++ b/content/renderer/media/mock_peer_connection_impl.h @@ -25,19 +25,19 @@ class MockPeerConnectionImpl : public webrtc::PeerConnectionInterface { // PeerConnectionInterface implementation. virtual rtc::scoped_refptr<webrtc::StreamCollectionInterface> - local_streams() OVERRIDE; + local_streams() override; virtual rtc::scoped_refptr<webrtc::StreamCollectionInterface> - remote_streams() OVERRIDE; + remote_streams() override; virtual bool AddStream( webrtc::MediaStreamInterface* local_stream, - const webrtc::MediaConstraintsInterface* constraints) OVERRIDE; + const webrtc::MediaConstraintsInterface* constraints) override; virtual void RemoveStream( - webrtc::MediaStreamInterface* local_stream) OVERRIDE; + webrtc::MediaStreamInterface* local_stream) override; virtual rtc::scoped_refptr<webrtc::DtmfSenderInterface> - CreateDtmfSender(webrtc::AudioTrackInterface* track) OVERRIDE; + CreateDtmfSender(webrtc::AudioTrackInterface* track) override; virtual rtc::scoped_refptr<webrtc::DataChannelInterface> CreateDataChannel(const std::string& label, - const webrtc::DataChannelInit* config) OVERRIDE; + const webrtc::DataChannelInit* config) override; virtual bool GetStats(webrtc::StatsObserver* observer, webrtc::MediaStreamTrackInterface* track) { @@ -45,43 +45,43 @@ class MockPeerConnectionImpl : public webrtc::PeerConnectionInterface { } virtual bool GetStats(webrtc::StatsObserver* observer, webrtc::MediaStreamTrackInterface* track, - StatsOutputLevel level) OVERRIDE; + StatsOutputLevel level) override; // Set Call this function to make sure next call to GetStats fail. void SetGetStatsResult(bool result) { getstats_result_ = result; } - virtual SignalingState signaling_state() OVERRIDE { + virtual SignalingState signaling_state() override { NOTIMPLEMENTED(); return PeerConnectionInterface::kStable; } - virtual IceState ice_state() OVERRIDE { + virtual IceState ice_state() override { NOTIMPLEMENTED(); return PeerConnectionInterface::kIceNew; } - virtual IceConnectionState ice_connection_state() OVERRIDE { + virtual IceConnectionState ice_connection_state() override { NOTIMPLEMENTED(); return PeerConnectionInterface::kIceConnectionNew; } - virtual IceGatheringState ice_gathering_state() OVERRIDE { + virtual IceGatheringState ice_gathering_state() override { NOTIMPLEMENTED(); return PeerConnectionInterface::kIceGatheringNew; } - virtual void Close() OVERRIDE { + virtual void Close() override { NOTIMPLEMENTED(); } virtual const webrtc::SessionDescriptionInterface* local_description() - const OVERRIDE; + const override; virtual const webrtc::SessionDescriptionInterface* remote_description() - const OVERRIDE; + const override; // JSEP01 APIs virtual void CreateOffer( webrtc::CreateSessionDescriptionObserver* observer, - const webrtc::MediaConstraintsInterface* constraints) OVERRIDE; + const webrtc::MediaConstraintsInterface* constraints) override; virtual void CreateAnswer( webrtc::CreateSessionDescriptionObserver* observer, - const webrtc::MediaConstraintsInterface* constraints) OVERRIDE; + const webrtc::MediaConstraintsInterface* constraints) override; MOCK_METHOD2(SetLocalDescription, void(webrtc::SetSessionDescriptionObserver* observer, webrtc::SessionDescriptionInterface* desc)); @@ -96,10 +96,10 @@ class MockPeerConnectionImpl : public webrtc::PeerConnectionInterface { webrtc::SessionDescriptionInterface* desc); virtual bool UpdateIce( const IceServers& configuration, - const webrtc::MediaConstraintsInterface* constraints) OVERRIDE; + const webrtc::MediaConstraintsInterface* constraints) override; virtual bool AddIceCandidate( - const webrtc::IceCandidateInterface* candidate) OVERRIDE; - virtual void RegisterUMAObserver(webrtc::UMAObserver* observer) OVERRIDE; + const webrtc::IceCandidateInterface* candidate) override; + virtual void RegisterUMAObserver(webrtc::UMAObserver* observer) override; void AddRemoteStream(webrtc::MediaStreamInterface* stream); diff --git a/content/renderer/media/native_handle_impl.h b/content/renderer/media/native_handle_impl.h index 36c5dab..7b5748b 100644 --- a/content/renderer/media/native_handle_impl.h +++ b/content/renderer/media/native_handle_impl.h @@ -19,7 +19,7 @@ class NativeHandleImpl : public webrtc::NativeHandle { // Retrieves the video frame in the handle. The frame is still ref-counted by // the handle. The ref count decreases when NativeHandleImpl is destroyed. - virtual void* GetHandle() OVERRIDE; + virtual void* GetHandle() override; private: scoped_refptr<media::VideoFrame> frame_; diff --git a/content/renderer/media/peer_connection_audio_sink_owner.h b/content/renderer/media/peer_connection_audio_sink_owner.h index 289a3f4..abd1100 100644 --- a/content/renderer/media/peer_connection_audio_sink_owner.h +++ b/content/renderer/media/peer_connection_audio_sink_owner.h @@ -28,13 +28,13 @@ class PeerConnectionAudioSinkOwner : public MediaStreamAudioTrackSink { int audio_delay_milliseconds, int current_volume, bool need_audio_processing, - bool key_pressed) OVERRIDE; - virtual void OnSetFormat(const media::AudioParameters& params) OVERRIDE; + bool key_pressed) override; + virtual void OnSetFormat(const media::AudioParameters& params) override; virtual void OnReadyStateChanged( - blink::WebMediaStreamSource::ReadyState state) OVERRIDE; - virtual void Reset() OVERRIDE; - virtual bool IsEqual(const MediaStreamAudioSink* other) const OVERRIDE; - virtual bool IsEqual(const PeerConnectionAudioSink* other) const OVERRIDE; + blink::WebMediaStreamSource::ReadyState state) override; + virtual void Reset() override; + virtual bool IsEqual(const MediaStreamAudioSink* other) const override; + virtual bool IsEqual(const PeerConnectionAudioSink* other) const override; protected: virtual ~PeerConnectionAudioSinkOwner() {} diff --git a/content/renderer/media/peer_connection_identity_service.h b/content/renderer/media/peer_connection_identity_service.h index a72cf47..e931c99 100644 --- a/content/renderer/media/peer_connection_identity_service.h +++ b/content/renderer/media/peer_connection_identity_service.h @@ -27,7 +27,7 @@ class PeerConnectionIdentityService virtual bool RequestIdentity( const std::string& identity_name, const std::string& common_name, - webrtc::DTLSIdentityRequestObserver* observer) OVERRIDE; + webrtc::DTLSIdentityRequestObserver* observer) override; private: void OnIdentityReady(const std::string& certificate, diff --git a/content/renderer/media/peer_connection_tracker.cc b/content/renderer/media/peer_connection_tracker.cc index 8e368b4..d64a629 100644 --- a/content/renderer/media/peer_connection_tracker.cc +++ b/content/renderer/media/peer_connection_tracker.cc @@ -247,7 +247,7 @@ class InternalStatsObserver : public webrtc::StatsObserver { : lid_(lid){} virtual void OnComplete( - const std::vector<webrtc::StatsReport>& reports) OVERRIDE { + const std::vector<webrtc::StatsReport>& reports) override { base::ListValue list; for (size_t i = 0; i < reports.size(); ++i) { diff --git a/content/renderer/media/peer_connection_tracker.h b/content/renderer/media/peer_connection_tracker.h index 8a774cb..707e2ee 100644 --- a/content/renderer/media/peer_connection_tracker.h +++ b/content/renderer/media/peer_connection_tracker.h @@ -51,7 +51,7 @@ class CONTENT_EXPORT PeerConnectionTracker : public RenderProcessObserver { }; // RenderProcessObserver implementation. - virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnControlMessageReceived(const IPC::Message& message) override; // // The following methods send an update to the browser process when a diff --git a/content/renderer/media/remote_media_stream_impl.cc b/content/renderer/media/remote_media_stream_impl.cc index d2421310..b5c28e5 100644 --- a/content/renderer/media/remote_media_stream_impl.cc +++ b/content/renderer/media/remote_media_stream_impl.cc @@ -103,7 +103,7 @@ class RemoteAudioMediaStreamTrackAdapter private: // webrtc::ObserverInterface implementation. - virtual void OnChanged() OVERRIDE; + virtual void OnChanged() override; webrtc::MediaStreamTrackInterface::TrackState state_; diff --git a/content/renderer/media/remote_media_stream_impl.h b/content/renderer/media/remote_media_stream_impl.h index 6b1554a..f17d47e 100644 --- a/content/renderer/media/remote_media_stream_impl.h +++ b/content/renderer/media/remote_media_stream_impl.h @@ -36,7 +36,7 @@ class CONTENT_EXPORT RemoteMediaStreamImpl private: // webrtc::ObserverInterface implementation. - virtual void OnChanged() OVERRIDE; + virtual void OnChanged() override; scoped_refptr<webrtc::MediaStreamInterface> webrtc_stream_; ScopedVector<RemoteMediaStreamTrackAdapter> video_track_observers_; diff --git a/content/renderer/media/render_media_log.h b/content/renderer/media/render_media_log.h index 9aac107..d17f543 100644 --- a/content/renderer/media/render_media_log.h +++ b/content/renderer/media/render_media_log.h @@ -27,7 +27,7 @@ class CONTENT_EXPORT RenderMediaLog : public media::MediaLog { RenderMediaLog(); // MediaLog implementation. - virtual void AddEvent(scoped_ptr<media::MediaLogEvent> event) OVERRIDE; + virtual void AddEvent(scoped_ptr<media::MediaLogEvent> event) override; // Will reset |last_ipc_send_time_| with the value of NowTicks(). void SetTickClockForTesting(scoped_ptr<base::TickClock> tick_clock); diff --git a/content/renderer/media/renderer_gpu_video_accelerator_factories.h b/content/renderer/media/renderer_gpu_video_accelerator_factories.h index f75fedc..55a2a46 100644 --- a/content/renderer/media/renderer_gpu_video_accelerator_factories.h +++ b/content/renderer/media/renderer_gpu_video_accelerator_factories.h @@ -46,25 +46,25 @@ class CONTENT_EXPORT RendererGpuVideoAcceleratorFactories // media::GpuVideoAcceleratorFactories implementation. virtual scoped_ptr<media::VideoDecodeAccelerator> - CreateVideoDecodeAccelerator() OVERRIDE; + CreateVideoDecodeAccelerator() override; virtual scoped_ptr<media::VideoEncodeAccelerator> - CreateVideoEncodeAccelerator() OVERRIDE; + CreateVideoEncodeAccelerator() override; // Creates textures and produces them into mailboxes. Returns true on success // or false on failure. virtual bool CreateTextures(int32 count, const gfx::Size& size, std::vector<uint32>* texture_ids, std::vector<gpu::Mailbox>* texture_mailboxes, - uint32 texture_target) OVERRIDE; - virtual void DeleteTexture(uint32 texture_id) OVERRIDE; - virtual void WaitSyncPoint(uint32 sync_point) OVERRIDE; + uint32 texture_target) override; + virtual void DeleteTexture(uint32 texture_id) override; + virtual void WaitSyncPoint(uint32 sync_point) override; virtual void ReadPixels(uint32 texture_id, const gfx::Rect& visible_rect, - const SkBitmap& pixels) OVERRIDE; - virtual base::SharedMemory* CreateSharedMemory(size_t size) OVERRIDE; - virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() OVERRIDE; + const SkBitmap& pixels) override; + virtual base::SharedMemory* CreateSharedMemory(size_t size) override; + virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() override; virtual std::vector<media::VideoEncodeAccelerator::SupportedProfile> - GetVideoEncodeAcceleratorSupportedProfiles() OVERRIDE; + GetVideoEncodeAcceleratorSupportedProfiles() override; private: friend class base::RefCountedThreadSafe<RendererGpuVideoAcceleratorFactories>; diff --git a/content/renderer/media/renderer_webaudiodevice_impl.h b/content/renderer/media/renderer_webaudiodevice_impl.h index 0f06a89..b81b9d5 100644 --- a/content/renderer/media/renderer_webaudiodevice_impl.h +++ b/content/renderer/media/renderer_webaudiodevice_impl.h @@ -34,9 +34,9 @@ class RendererWebAudioDeviceImpl // AudioRendererSink::RenderCallback implementation. virtual int Render(media::AudioBus* dest, - int audio_delay_milliseconds) OVERRIDE; + int audio_delay_milliseconds) override; - virtual void OnRenderError() OVERRIDE; + virtual void OnRenderError() override; private: const media::AudioParameters params_; diff --git a/content/renderer/media/rtc_data_channel_handler.h b/content/renderer/media/rtc_data_channel_handler.h index 1be7e87..0912019 100644 --- a/content/renderer/media/rtc_data_channel_handler.h +++ b/content/renderer/media/rtc_data_channel_handler.h @@ -30,23 +30,23 @@ class CONTENT_EXPORT RtcDataChannelHandler // blink::WebRTCDataChannelHandler implementation. virtual void setClient( - blink::WebRTCDataChannelHandlerClient* client) OVERRIDE; - virtual blink::WebString label() OVERRIDE; - virtual bool isReliable() OVERRIDE; - virtual bool ordered() const OVERRIDE; - virtual unsigned short maxRetransmitTime() const OVERRIDE; - virtual unsigned short maxRetransmits() const OVERRIDE; - virtual blink::WebString protocol() const OVERRIDE; - virtual bool negotiated() const OVERRIDE; - virtual unsigned short id() const OVERRIDE; - virtual unsigned long bufferedAmount() OVERRIDE; - virtual bool sendStringData(const blink::WebString& data) OVERRIDE; - virtual bool sendRawData(const char* data, size_t length) OVERRIDE; - virtual void close() OVERRIDE; + blink::WebRTCDataChannelHandlerClient* client) override; + virtual blink::WebString label() override; + virtual bool isReliable() override; + virtual bool ordered() const override; + virtual unsigned short maxRetransmitTime() const override; + virtual unsigned short maxRetransmits() const override; + virtual blink::WebString protocol() const override; + virtual bool negotiated() const override; + virtual unsigned short id() const override; + virtual unsigned long bufferedAmount() override; + virtual bool sendStringData(const blink::WebString& data) override; + virtual bool sendRawData(const char* data, size_t length) override; + virtual void close() override; // webrtc::DataChannelObserver implementation. - virtual void OnStateChange() OVERRIDE; - virtual void OnMessage(const webrtc::DataBuffer& buffer) OVERRIDE; + virtual void OnStateChange() override; + virtual void OnMessage(const webrtc::DataBuffer& buffer) override; private: void RecordMessageSent(size_t num_bytes); diff --git a/content/renderer/media/rtc_dtmf_sender_handler.h b/content/renderer/media/rtc_dtmf_sender_handler.h index 3f77525..a7a79bb 100644 --- a/content/renderer/media/rtc_dtmf_sender_handler.h +++ b/content/renderer/media/rtc_dtmf_sender_handler.h @@ -32,14 +32,14 @@ class CONTENT_EXPORT RtcDtmfSenderHandler // blink::WebRTCDTMFSenderHandler implementation. virtual void setClient( - blink::WebRTCDTMFSenderHandlerClient* client) OVERRIDE; - virtual blink::WebString currentToneBuffer() OVERRIDE; - virtual bool canInsertDTMF() OVERRIDE; + blink::WebRTCDTMFSenderHandlerClient* client) override; + virtual blink::WebString currentToneBuffer() override; + virtual bool canInsertDTMF() override; virtual bool insertDTMF(const blink::WebString& tones, long duration, - long interToneGap) OVERRIDE; + long interToneGap) override; // webrtc::DtmfSenderObserverInterface implementation. - virtual void OnToneChange(const std::string& tone) OVERRIDE; + virtual void OnToneChange(const std::string& tone) override; private: scoped_refptr<webrtc::DtmfSenderInterface> dtmf_sender_; diff --git a/content/renderer/media/rtc_media_constraints.h b/content/renderer/media/rtc_media_constraints.h index b124736..d969df1 100644 --- a/content/renderer/media/rtc_media_constraints.h +++ b/content/renderer/media/rtc_media_constraints.h @@ -25,8 +25,8 @@ class CONTENT_EXPORT RTCMediaConstraints explicit RTCMediaConstraints( const blink::WebMediaConstraints& constraints); virtual ~RTCMediaConstraints(); - virtual const Constraints& GetMandatory() const OVERRIDE; - virtual const Constraints& GetOptional() const OVERRIDE; + virtual const Constraints& GetMandatory() const override; + virtual const Constraints& GetOptional() const override; // Adds a mandatory constraint, optionally overriding an existing one. // If the constraint is already set and |override_if_exists| is false, // the function will return false, otherwise true. diff --git a/content/renderer/media/rtc_peer_connection_handler.cc b/content/renderer/media/rtc_peer_connection_handler.cc index 45e233b..9adaa29 100644 --- a/content/renderer/media/rtc_peer_connection_handler.cc +++ b/content/renderer/media/rtc_peer_connection_handler.cc @@ -202,12 +202,12 @@ class CreateSessionDescriptionRequest PeerConnectionTracker::Action action) : webkit_request_(request), tracker_(handler, action) {} - virtual void OnSuccess(webrtc::SessionDescriptionInterface* desc) OVERRIDE { + virtual void OnSuccess(webrtc::SessionDescriptionInterface* desc) override { tracker_.TrackOnSuccess(desc); webkit_request_.requestSucceeded(CreateWebKitSessionDescription(desc)); delete desc; } - virtual void OnFailure(const std::string& error) OVERRIDE { + virtual void OnFailure(const std::string& error) override { tracker_.TrackOnFailure(error); webkit_request_.requestFailed(base::UTF8ToUTF16(error)); } @@ -231,11 +231,11 @@ class SetSessionDescriptionRequest PeerConnectionTracker::Action action) : webkit_request_(request), tracker_(handler, action) {} - virtual void OnSuccess() OVERRIDE { + virtual void OnSuccess() override { tracker_.TrackOnSuccess(NULL); webkit_request_.requestSucceeded(); } - virtual void OnFailure(const std::string& error) OVERRIDE { + virtual void OnFailure(const std::string& error) override { tracker_.TrackOnFailure(error); webkit_request_.requestFailed(base::UTF8ToUTF16(error)); } @@ -258,7 +258,7 @@ class StatsResponse : public webrtc::StatsObserver { TRACE_EVENT_ASYNC_BEGIN0("webrtc", "getStats_Native", this); } - virtual void OnComplete(const StatsReports& reports) OVERRIDE { + virtual void OnComplete(const StatsReports& reports) override { TRACE_EVENT0("webrtc", "StatsResponse::OnComplete") for (StatsReports::const_iterator it = reports.begin(); it != reports.end(); ++it) { @@ -350,14 +350,14 @@ class PeerConnectionUMAObserver : public webrtc::UMAObserver { virtual ~PeerConnectionUMAObserver() {} virtual void IncrementCounter( - webrtc::PeerConnectionUMAMetricsCounter counter) OVERRIDE { + webrtc::PeerConnectionUMAMetricsCounter counter) override { UMA_HISTOGRAM_ENUMERATION("WebRTC.PeerConnection.IPMetrics", counter, webrtc::kBoundary); } virtual void AddHistogramSample( - webrtc::PeerConnectionUMAMetricsName type, int value) OVERRIDE { + webrtc::PeerConnectionUMAMetricsName type, int value) override { switch (type) { case webrtc::kTimeToConnect: UMA_HISTOGRAM_MEDIUM_TIMES( diff --git a/content/renderer/media/rtc_peer_connection_handler.h b/content/renderer/media/rtc_peer_connection_handler.h index 81be1ac..5446588 100644 --- a/content/renderer/media/rtc_peer_connection_handler.h +++ b/content/renderer/media/rtc_peer_connection_handler.h @@ -108,73 +108,73 @@ class CONTENT_EXPORT RTCPeerConnectionHandler // blink::WebRTCPeerConnectionHandler implementation virtual bool initialize( const blink::WebRTCConfiguration& server_configuration, - const blink::WebMediaConstraints& options) OVERRIDE; + const blink::WebMediaConstraints& options) override; virtual void createOffer( const blink::WebRTCSessionDescriptionRequest& request, - const blink::WebMediaConstraints& options) OVERRIDE; + const blink::WebMediaConstraints& options) override; virtual void createOffer( const blink::WebRTCSessionDescriptionRequest& request, - const blink::WebRTCOfferOptions& options) OVERRIDE; + const blink::WebRTCOfferOptions& options) override; virtual void createAnswer( const blink::WebRTCSessionDescriptionRequest& request, - const blink::WebMediaConstraints& options) OVERRIDE; + const blink::WebMediaConstraints& options) override; virtual void setLocalDescription( const blink::WebRTCVoidRequest& request, - const blink::WebRTCSessionDescription& description) OVERRIDE; + const blink::WebRTCSessionDescription& description) override; virtual void setRemoteDescription( const blink::WebRTCVoidRequest& request, - const blink::WebRTCSessionDescription& description) OVERRIDE; + const blink::WebRTCSessionDescription& description) override; virtual blink::WebRTCSessionDescription localDescription() - OVERRIDE; + override; virtual blink::WebRTCSessionDescription remoteDescription() - OVERRIDE; + override; virtual bool updateICE( const blink::WebRTCConfiguration& server_configuration, - const blink::WebMediaConstraints& options) OVERRIDE; + const blink::WebMediaConstraints& options) override; virtual bool addICECandidate( - const blink::WebRTCICECandidate& candidate) OVERRIDE; + const blink::WebRTCICECandidate& candidate) override; virtual bool addICECandidate( const blink::WebRTCVoidRequest& request, - const blink::WebRTCICECandidate& candidate) OVERRIDE; + const blink::WebRTCICECandidate& candidate) override; virtual void OnaddICECandidateResult(const blink::WebRTCVoidRequest& request, bool result); virtual bool addStream( const blink::WebMediaStream& stream, - const blink::WebMediaConstraints& options) OVERRIDE; + const blink::WebMediaConstraints& options) override; virtual void removeStream( - const blink::WebMediaStream& stream) OVERRIDE; + const blink::WebMediaStream& stream) override; virtual void getStats( - const blink::WebRTCStatsRequest& request) OVERRIDE; + const blink::WebRTCStatsRequest& request) override; virtual blink::WebRTCDataChannelHandler* createDataChannel( const blink::WebString& label, - const blink::WebRTCDataChannelInit& init) OVERRIDE; + const blink::WebRTCDataChannelInit& init) override; virtual blink::WebRTCDTMFSenderHandler* createDTMFSender( - const blink::WebMediaStreamTrack& track) OVERRIDE; - virtual void stop() OVERRIDE; + const blink::WebMediaStreamTrack& track) override; + virtual void stop() override; // webrtc::PeerConnectionObserver implementation - virtual void OnError() OVERRIDE; + virtual void OnError() override; // Triggered when the SignalingState changed. virtual void OnSignalingChange( - webrtc::PeerConnectionInterface::SignalingState new_state) OVERRIDE; - virtual void OnAddStream(webrtc::MediaStreamInterface* stream) OVERRIDE; - virtual void OnRemoveStream(webrtc::MediaStreamInterface* stream) OVERRIDE; + webrtc::PeerConnectionInterface::SignalingState new_state) override; + virtual void OnAddStream(webrtc::MediaStreamInterface* stream) override; + virtual void OnRemoveStream(webrtc::MediaStreamInterface* stream) override; virtual void OnIceCandidate( - const webrtc::IceCandidateInterface* candidate) OVERRIDE; + const webrtc::IceCandidateInterface* candidate) override; virtual void OnIceConnectionChange( - webrtc::PeerConnectionInterface::IceConnectionState new_state) OVERRIDE; + webrtc::PeerConnectionInterface::IceConnectionState new_state) override; virtual void OnIceGatheringChange( - webrtc::PeerConnectionInterface::IceGatheringState new_state) OVERRIDE; + webrtc::PeerConnectionInterface::IceGatheringState new_state) override; virtual void OnDataChannel( - webrtc::DataChannelInterface* data_channel) OVERRIDE; - virtual void OnRenegotiationNeeded() OVERRIDE; + webrtc::DataChannelInterface* data_channel) override; + virtual void OnRenegotiationNeeded() override; // Delegate functions to allow for mocking of WebKit interfaces. // getStats takes ownership of request parameter. diff --git a/content/renderer/media/rtc_peer_connection_handler_unittest.cc b/content/renderer/media/rtc_peer_connection_handler_unittest.cc index 630861d..0c95ca0 100644 --- a/content/renderer/media/rtc_peer_connection_handler_unittest.cc +++ b/content/renderer/media/rtc_peer_connection_handler_unittest.cc @@ -62,14 +62,14 @@ class MockRTCStatsResponse : public LocalRTCStatsResponse { virtual size_t addReport(blink::WebString type, blink::WebString id, - double timestamp) OVERRIDE { + double timestamp) override { ++report_count_; return report_count_; } virtual void addStatistic(size_t report, blink::WebString name, blink::WebString value) - OVERRIDE { + override { ++statistic_count_; } int report_count() const { return report_count_; } @@ -86,20 +86,20 @@ class MockRTCStatsRequest : public LocalRTCStatsRequest { : has_selector_(false), request_succeeded_called_(false) {} - virtual bool hasSelector() const OVERRIDE { + virtual bool hasSelector() const override { return has_selector_; } - virtual blink::WebMediaStreamTrack component() const OVERRIDE { + virtual blink::WebMediaStreamTrack component() const override { return component_; } - virtual scoped_refptr<LocalRTCStatsResponse> createResponse() OVERRIDE { + virtual scoped_refptr<LocalRTCStatsResponse> createResponse() override { DCHECK(!response_.get()); response_ = new rtc::RefCountedObject<MockRTCStatsResponse>(); return response_; } virtual void requestSucceeded(const LocalRTCStatsResponse* response) - OVERRIDE { + override { EXPECT_EQ(response, response_.get()); request_succeeded_called_ = true; } diff --git a/content/renderer/media/rtc_video_decoder.h b/content/renderer/media/rtc_video_decoder.h index 8c8a6e3..f2aff14 100644 --- a/content/renderer/media/rtc_video_decoder.h +++ b/content/renderer/media/rtc_video_decoder.h @@ -56,34 +56,34 @@ class CONTENT_EXPORT RTCVideoDecoder // webrtc::VideoDecoder implementation. // Called on WebRTC DecodingThread. virtual int32_t InitDecode(const webrtc::VideoCodec* codecSettings, - int32_t numberOfCores) OVERRIDE; + int32_t numberOfCores) override; // Called on WebRTC DecodingThread. virtual int32_t Decode( const webrtc::EncodedImage& inputImage, bool missingFrames, const webrtc::RTPFragmentationHeader* fragmentation, const webrtc::CodecSpecificInfo* codecSpecificInfo = NULL, - int64_t renderTimeMs = -1) OVERRIDE; + int64_t renderTimeMs = -1) override; // Called on WebRTC DecodingThread. virtual int32_t RegisterDecodeCompleteCallback( - webrtc::DecodedImageCallback* callback) OVERRIDE; + webrtc::DecodedImageCallback* callback) override; // Called on Chrome_libJingle_WorkerThread. The child thread is blocked while // this runs. - virtual int32_t Release() OVERRIDE; + virtual int32_t Release() override; // Called on Chrome_libJingle_WorkerThread. The child thread is blocked while // this runs. - virtual int32_t Reset() OVERRIDE; + virtual int32_t Reset() override; // VideoDecodeAccelerator::Client implementation. virtual void ProvidePictureBuffers(uint32 count, const gfx::Size& size, - uint32 texture_target) OVERRIDE; - virtual void DismissPictureBuffer(int32 id) OVERRIDE; - virtual void PictureReady(const media::Picture& picture) OVERRIDE; - virtual void NotifyEndOfBitstreamBuffer(int32 id) OVERRIDE; - virtual void NotifyFlushDone() OVERRIDE; - virtual void NotifyResetDone() OVERRIDE; - virtual void NotifyError(media::VideoDecodeAccelerator::Error error) OVERRIDE; + uint32 texture_target) override; + virtual void DismissPictureBuffer(int32 id) override; + virtual void PictureReady(const media::Picture& picture) override; + virtual void NotifyEndOfBitstreamBuffer(int32 id) override; + virtual void NotifyFlushDone() override; + virtual void NotifyResetDone() override; + virtual void NotifyError(media::VideoDecodeAccelerator::Error error) override; private: class SHMBuffer; diff --git a/content/renderer/media/rtc_video_decoder_factory.h b/content/renderer/media/rtc_video_decoder_factory.h index d40203f..860a4bd 100644 --- a/content/renderer/media/rtc_video_decoder_factory.h +++ b/content/renderer/media/rtc_video_decoder_factory.h @@ -32,11 +32,11 @@ class CONTENT_EXPORT RTCVideoDecoderFactory // Runs on Chrome_libJingle_WorkerThread. The child thread is blocked while // this runs. virtual webrtc::VideoDecoder* CreateVideoDecoder(webrtc::VideoCodecType type) - OVERRIDE; + override; // Runs on Chrome_libJingle_WorkerThread. The child thread is blocked while // this runs. - virtual void DestroyVideoDecoder(webrtc::VideoDecoder* decoder) OVERRIDE; + virtual void DestroyVideoDecoder(webrtc::VideoDecoder* decoder) override; private: scoped_refptr<media::GpuVideoAcceleratorFactories> gpu_factories_; diff --git a/content/renderer/media/rtc_video_decoder_unittest.cc b/content/renderer/media/rtc_video_decoder_unittest.cc index c060344..b32440c5 100644 --- a/content/renderer/media/rtc_video_decoder_unittest.cc +++ b/content/renderer/media/rtc_video_decoder_unittest.cc @@ -31,7 +31,7 @@ class RTCVideoDecoderTest : public ::testing::Test, memset(&codec_, 0, sizeof(codec_)); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(vda_thread_.Start()); vda_task_runner_ = vda_thread_.message_loop_proxy(); mock_vda_ = new media::MockVideoDecodeAccelerator; @@ -47,7 +47,7 @@ class RTCVideoDecoderTest : public ::testing::Test, EXPECT_CALL(*mock_vda_, Destroy()).Times(1); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { VLOG(2) << "TearDown"; EXPECT_TRUE(vda_thread_.IsRunning()); RunUntilIdle(); // Wait until all callbascks complete. @@ -57,7 +57,7 @@ class RTCVideoDecoderTest : public ::testing::Test, vda_thread_.Stop(); } - virtual int32_t Decoded(webrtc::I420VideoFrame& decoded_image) OVERRIDE { + virtual int32_t Decoded(webrtc::I420VideoFrame& decoded_image) override { VLOG(2) << "Decoded"; EXPECT_EQ(vda_task_runner_, base::MessageLoopProxy::current()); return WEBRTC_VIDEO_CODEC_OK; diff --git a/content/renderer/media/rtc_video_encoder.cc b/content/renderer/media/rtc_video_encoder.cc index 3d6cb59..99e963a 100644 --- a/content/renderer/media/rtc_video_encoder.cc +++ b/content/renderer/media/rtc_video_encoder.cc @@ -115,11 +115,11 @@ class RTCVideoEncoder::Impl // media::VideoEncodeAccelerator::Client implementation. virtual void RequireBitstreamBuffers(unsigned int input_count, const gfx::Size& input_coded_size, - size_t output_buffer_size) OVERRIDE; + size_t output_buffer_size) override; virtual void BitstreamBufferReady(int32 bitstream_buffer_id, size_t payload_size, - bool key_frame) OVERRIDE; - virtual void NotifyError(media::VideoEncodeAccelerator::Error error) OVERRIDE; + bool key_frame) override; + virtual void NotifyError(media::VideoEncodeAccelerator::Error error) override; private: friend class base::RefCountedThreadSafe<Impl>; diff --git a/content/renderer/media/rtc_video_encoder.h b/content/renderer/media/rtc_video_encoder.h index 8f1d279..43852ef 100644 --- a/content/renderer/media/rtc_video_encoder.h +++ b/content/renderer/media/rtc_video_encoder.h @@ -55,16 +55,16 @@ class CONTENT_EXPORT RTCVideoEncoder // appropriate VEA methods. virtual int32_t InitEncode(const webrtc::VideoCodec* codec_settings, int32_t number_of_cores, - uint32_t max_payload_size) OVERRIDE; + uint32_t max_payload_size) override; virtual int32_t Encode( const webrtc::I420VideoFrame& input_image, const webrtc::CodecSpecificInfo* codec_specific_info, - const std::vector<webrtc::VideoFrameType>* frame_types) OVERRIDE; + const std::vector<webrtc::VideoFrameType>* frame_types) override; virtual int32_t RegisterEncodeCompleteCallback( - webrtc::EncodedImageCallback* callback) OVERRIDE; - virtual int32_t Release() OVERRIDE; - virtual int32_t SetChannelParameters(uint32_t packet_loss, int rtt) OVERRIDE; - virtual int32_t SetRates(uint32_t new_bit_rate, uint32_t frame_rate) OVERRIDE; + webrtc::EncodedImageCallback* callback) override; + virtual int32_t Release() override; + virtual int32_t SetChannelParameters(uint32_t packet_loss, int rtt) override; + virtual int32_t SetRates(uint32_t new_bit_rate, uint32_t frame_rate) override; private: class Impl; diff --git a/content/renderer/media/rtc_video_encoder_factory.h b/content/renderer/media/rtc_video_encoder_factory.h index b9971bf..cca7643 100644 --- a/content/renderer/media/rtc_video_encoder_factory.h +++ b/content/renderer/media/rtc_video_encoder_factory.h @@ -31,11 +31,11 @@ class CONTENT_EXPORT RTCVideoEncoderFactory // cricket::WebRtcVideoEncoderFactory implementation. virtual webrtc::VideoEncoder* CreateVideoEncoder( - webrtc::VideoCodecType type) OVERRIDE; - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual const std::vector<VideoCodec>& codecs() const OVERRIDE; - virtual void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) OVERRIDE; + webrtc::VideoCodecType type) override; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual const std::vector<VideoCodec>& codecs() const override; + virtual void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override; private: const scoped_refptr<media::GpuVideoAcceleratorFactories> gpu_factories_; diff --git a/content/renderer/media/rtc_video_renderer.h b/content/renderer/media/rtc_video_renderer.h index 6add0df..7776d8b 100644 --- a/content/renderer/media/rtc_video_renderer.h +++ b/content/renderer/media/rtc_video_renderer.h @@ -39,10 +39,10 @@ class CONTENT_EXPORT RTCVideoRenderer const RepaintCB& repaint_cb); // VideoFrameProvider implementation. Called on the main thread. - virtual void Start() OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Play() OVERRIDE; - virtual void Pause() OVERRIDE; + virtual void Start() override; + virtual void Stop() override; + virtual void Play() override; + virtual void Pause() override; protected: virtual ~RTCVideoRenderer(); @@ -60,7 +60,7 @@ class CONTENT_EXPORT RTCVideoRenderer // VideoTrackSink implementation. Called on the main thread. virtual void OnReadyStateChanged( - blink::WebMediaStreamSource::ReadyState state) OVERRIDE; + blink::WebMediaStreamSource::ReadyState state) override; void RenderSignalingFrame(); diff --git a/content/renderer/media/user_media_client_impl.h b/content/renderer/media/user_media_client_impl.h index a380664..87a5958 100644 --- a/content/renderer/media/user_media_client_impl.h +++ b/content/renderer/media/user_media_client_impl.h @@ -62,34 +62,34 @@ class CONTENT_EXPORT UserMediaClientImpl virtual void cancelUserMediaRequest( const blink::WebUserMediaRequest& user_media_request); virtual void requestMediaDevices( - const blink::WebMediaDevicesRequest& media_devices_request) OVERRIDE; + const blink::WebMediaDevicesRequest& media_devices_request) override; virtual void cancelMediaDevicesRequest( - const blink::WebMediaDevicesRequest& media_devices_request) OVERRIDE; + const blink::WebMediaDevicesRequest& media_devices_request) override; virtual void requestSources( - const blink::WebMediaStreamTrackSourcesRequest& sources_request) OVERRIDE; + const blink::WebMediaStreamTrackSourcesRequest& sources_request) override; // MediaStreamDispatcherEventHandler implementation. virtual void OnStreamGenerated( int request_id, const std::string& label, const StreamDeviceInfoArray& audio_array, - const StreamDeviceInfoArray& video_array) OVERRIDE; + const StreamDeviceInfoArray& video_array) override; virtual void OnStreamGenerationFailed( int request_id, - MediaStreamRequestResult result) OVERRIDE; + MediaStreamRequestResult result) override; virtual void OnDeviceStopped(const std::string& label, - const StreamDeviceInfo& device_info) OVERRIDE; + const StreamDeviceInfo& device_info) override; virtual void OnDevicesEnumerated( int request_id, - const StreamDeviceInfoArray& device_array) OVERRIDE; + 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; + const StreamDeviceInfo& device_info) override; + virtual void OnDeviceOpenFailed(int request_id) override; - // RenderFrameObserver OVERRIDE - virtual void FrameWillClose() OVERRIDE; + // RenderFrameObserver override + virtual void FrameWillClose() override; protected: // Called when |source| has been stopped from JavaScript. diff --git a/content/renderer/media/user_media_client_impl_unittest.cc b/content/renderer/media/user_media_client_impl_unittest.cc index 386ce34..dba46e9 100644 --- a/content/renderer/media/user_media_client_impl_unittest.cc +++ b/content/renderer/media/user_media_client_impl_unittest.cc @@ -77,14 +77,14 @@ class UserMediaClientImplUnderTest : public UserMediaClientImpl { virtual void GetUserMediaRequestSucceeded( const blink::WebMediaStream& stream, - blink::WebUserMediaRequest* request_info) OVERRIDE { + blink::WebUserMediaRequest* request_info) override { last_generated_stream_ = stream; state_ = REQUEST_SUCCEEDED; } virtual void GetUserMediaRequestFailed( blink::WebUserMediaRequest* request_info, - content::MediaStreamRequestResult result) OVERRIDE { + content::MediaStreamRequestResult result) override { last_generated_stream_.reset(); state_ = REQUEST_FAILED; result_ = result; @@ -93,7 +93,7 @@ class UserMediaClientImplUnderTest : public UserMediaClientImpl { virtual void GetUserMediaRequestTrackStartedFailed( blink::WebUserMediaRequest* request_info, MediaStreamRequestResult result, - const blink::WebString& result_name) OVERRIDE { + const blink::WebString& result_name) override { last_generated_stream_.reset(); state_ = REQUEST_FAILED; result_ = result; @@ -102,21 +102,21 @@ class UserMediaClientImplUnderTest : public UserMediaClientImpl { virtual void EnumerateDevicesSucceded( blink::WebMediaDevicesRequest* request, - blink::WebVector<blink::WebMediaDeviceInfo>& devices) OVERRIDE { + blink::WebVector<blink::WebMediaDeviceInfo>& devices) override { state_ = REQUEST_SUCCEEDED; last_devices_ = devices; } virtual void EnumerateSourcesSucceded( blink::WebMediaStreamTrackSourcesRequest* request, - blink::WebVector<blink::WebSourceInfo>& sources) OVERRIDE { + blink::WebVector<blink::WebSourceInfo>& sources) override { state_ = REQUEST_SUCCEEDED; last_sources_ = sources; } virtual MediaStreamVideoSource* CreateVideoSource( const StreamDeviceInfo& device, - const MediaStreamSource::SourceStoppedCallback& stop_callback) OVERRIDE { + const MediaStreamSource::SourceStoppedCallback& stop_callback) override { video_source_ = new MockMediaStreamVideoCapturerSource(device, stop_callback, factory_); @@ -170,7 +170,7 @@ class UserMediaClientImplTest : public ::testing::Test { scoped_ptr<MediaStreamDispatcher>(ms_dispatcher_).Pass())); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { used_media_impl_.reset(); blink::WebHeap::collectAllGarbageForTesting(); } diff --git a/content/renderer/media/video_capture_impl.h b/content/renderer/media/video_capture_impl.h index 0081177..746f9e8 100644 --- a/content/renderer/media/video_capture_impl.h +++ b/content/renderer/media/video_capture_impl.h @@ -110,22 +110,22 @@ class CONTENT_EXPORT VideoCaptureImpl // VideoCaptureMessageFilter::Delegate interface. virtual void OnBufferCreated(base::SharedMemoryHandle handle, int length, - int buffer_id) OVERRIDE; - virtual void OnBufferDestroyed(int buffer_id) OVERRIDE; + int buffer_id) override; + virtual void OnBufferDestroyed(int buffer_id) override; virtual void OnBufferReceived(int buffer_id, const media::VideoCaptureFormat& format, const gfx::Rect& visible_rect, - base::TimeTicks) OVERRIDE; + base::TimeTicks) override; virtual void OnMailboxBufferReceived(int buffer_id, const gpu::MailboxHolder& mailbox_holder, const media::VideoCaptureFormat& format, - base::TimeTicks timestamp) OVERRIDE; - virtual void OnStateChanged(VideoCaptureState state) OVERRIDE; + base::TimeTicks timestamp) override; + virtual void OnStateChanged(VideoCaptureState state) override; virtual void OnDeviceSupportedFormatsEnumerated( - const media::VideoCaptureFormats& supported_formats) OVERRIDE; + const media::VideoCaptureFormats& supported_formats) override; virtual void OnDeviceFormatsInUseReceived( - const media::VideoCaptureFormats& formats_in_use) OVERRIDE; - virtual void OnDelegateAdded(int32 device_id) OVERRIDE; + const media::VideoCaptureFormats& formats_in_use) override; + virtual void OnDelegateAdded(int32 device_id) override; // Sends an IPC message to browser process when all clients are done with the // buffer. diff --git a/content/renderer/media/video_capture_impl_manager_unittest.cc b/content/renderer/media/video_capture_impl_manager_unittest.cc index 7ab67a4..e1a3046 100644 --- a/content/renderer/media/video_capture_impl_manager_unittest.cc +++ b/content/renderer/media/video_capture_impl_manager_unittest.cc @@ -56,7 +56,7 @@ class MockVideoCaptureImplManager : public VideoCaptureImplManager { protected: virtual VideoCaptureImpl* CreateVideoCaptureImplForTesting( media::VideoCaptureSessionId id, - VideoCaptureMessageFilter* filter) const OVERRIDE { + VideoCaptureMessageFilter* filter) const override { return new MockVideoCaptureImpl(id, filter, destruct_video_capture_callback_); diff --git a/content/renderer/media/video_capture_impl_unittest.cc b/content/renderer/media/video_capture_impl_unittest.cc index 91b767f..b06cc55 100644 --- a/content/renderer/media/video_capture_impl_unittest.cc +++ b/content/renderer/media/video_capture_impl_unittest.cc @@ -43,7 +43,7 @@ class VideoCaptureImplTest : public ::testing::Test { virtual ~MockVideoCaptureImpl() {} // Override Send() to mimic device to send events. - virtual void Send(IPC::Message* message) OVERRIDE { + virtual void Send(IPC::Message* message) override { CHECK(message); // In this method, messages are sent to the according handlers as if diff --git a/content/renderer/media/video_capture_message_filter.h b/content/renderer/media/video_capture_message_filter.h index b1b4b10..a875a95 100644 --- a/content/renderer/media/video_capture_message_filter.h +++ b/content/renderer/media/video_capture_message_filter.h @@ -80,10 +80,10 @@ class CONTENT_EXPORT VideoCaptureMessageFilter : public IPC::MessageFilter { virtual bool Send(IPC::Message* message); // IPC::MessageFilter override. Called on IO thread. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE; - virtual void OnFilterRemoved() OVERRIDE; - virtual void OnChannelClosing() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void OnFilterAdded(IPC::Sender* sender) override; + virtual void OnFilterRemoved() override; + virtual void OnChannelClosing() override; protected: virtual ~VideoCaptureMessageFilter(); diff --git a/content/renderer/media/video_capture_message_filter_unittest.cc b/content/renderer/media/video_capture_message_filter_unittest.cc index 4030ba7..4633585 100644 --- a/content/renderer/media/video_capture_message_filter_unittest.cc +++ b/content/renderer/media/video_capture_message_filter_unittest.cc @@ -45,7 +45,7 @@ class MockVideoCaptureDelegate : public VideoCaptureMessageFilter::Delegate { MOCK_METHOD1(OnDeviceFormatsInUseReceived, void(const media::VideoCaptureFormats& formats_in_use)); - virtual void OnDelegateAdded(int32 device_id) OVERRIDE { + virtual void OnDelegateAdded(int32 device_id) override { ASSERT_TRUE(device_id != 0); ASSERT_TRUE(device_id_ == 0); device_id_ = device_id; diff --git a/content/renderer/media/video_source_handler_unittest.cc b/content/renderer/media/video_source_handler_unittest.cc index 486f784..d7cad70 100644 --- a/content/renderer/media/video_source_handler_unittest.cc +++ b/content/renderer/media/video_source_handler_unittest.cc @@ -28,7 +28,7 @@ static const std::string kUnknownStreamUrl = "unknown_stream_url"; class FakeFrameReader : public FrameReaderInterface { public: virtual void GotFrame( - const scoped_refptr<media::VideoFrame>& frame) OVERRIDE { + const scoped_refptr<media::VideoFrame>& frame) override { last_frame_ = frame; } diff --git a/content/renderer/media/webaudio_capturer_source.h b/content/renderer/media/webaudio_capturer_source.h index fdd3f9c..6382bd3 100644 --- a/content/renderer/media/webaudio_capturer_source.h +++ b/content/renderer/media/webaudio_capturer_source.h @@ -34,11 +34,11 @@ class WebAudioCapturerSource // WebAudioDestinationConsumer implementation. // setFormat() is called early on, so that we can configure the audio track. - virtual void setFormat(size_t number_of_channels, float sample_rate) OVERRIDE; + virtual void setFormat(size_t number_of_channels, float sample_rate) override; // MediaStreamAudioDestinationNode periodically calls consumeAudio(). // Called on the WebAudio audio thread. virtual void consumeAudio(const blink::WebVector<const float*>& audio_data, - size_t number_of_frames) OVERRIDE; + size_t number_of_frames) override; // Called when the WebAudioCapturerSource is hooking to a media audio track. // |track| is the sink of the data flow. |source_provider| is the source of diff --git a/content/renderer/media/webmediaplayer_ms.h b/content/renderer/media/webmediaplayer_ms.h index 975218f..d469ef8 100644 --- a/content/renderer/media/webmediaplayer_ms.h +++ b/content/renderer/media/webmediaplayer_ms.h @@ -119,10 +119,10 @@ class WebMediaPlayerMS // VideoFrameProvider implementation. virtual void SetVideoFrameProviderClient( - cc::VideoFrameProvider::Client* client) OVERRIDE; - virtual scoped_refptr<media::VideoFrame> GetCurrentFrame() OVERRIDE; + cc::VideoFrameProvider::Client* client) override; + virtual scoped_refptr<media::VideoFrame> GetCurrentFrame() override; virtual void PutCurrentFrame(const scoped_refptr<media::VideoFrame>& frame) - OVERRIDE; + override; private: // The callback for VideoFrameProvider to signal a new frame is available. diff --git a/content/renderer/media/webrtc/media_stream_remote_video_source.cc b/content/renderer/media/webrtc/media_stream_remote_video_source.cc index f912cd5..0cff197 100644 --- a/content/renderer/media/webrtc/media_stream_remote_video_source.cc +++ b/content/renderer/media/webrtc/media_stream_remote_video_source.cc @@ -34,8 +34,8 @@ class MediaStreamRemoteVideoSource::RemoteVideoSourceDelegate // Implements webrtc::VideoRendererInterface used for receiving video frames // from the PeerConnection video track. May be called on a libjingle internal // thread. - virtual void SetSize(int width, int height) OVERRIDE; - virtual void RenderFrame(const cricket::VideoFrame* frame) OVERRIDE; + virtual void SetSize(int width, int height) override; + virtual void RenderFrame(const cricket::VideoFrame* frame) override; void DoRenderFrameOnIOThread(scoped_refptr<media::VideoFrame> video_frame, const media::VideoCaptureFormat& format); diff --git a/content/renderer/media/webrtc/media_stream_remote_video_source.h b/content/renderer/media/webrtc/media_stream_remote_video_source.h index dfcade3..ecf5aa5 100644 --- a/content/renderer/media/webrtc/media_stream_remote_video_source.h +++ b/content/renderer/media/webrtc/media_stream_remote_video_source.h @@ -31,13 +31,13 @@ class CONTENT_EXPORT MediaStreamRemoteVideoSource int max_requested_width, int max_requested_height, double max_requested_frame_rate, - const VideoCaptureDeviceFormatsCB& callback) OVERRIDE; + const VideoCaptureDeviceFormatsCB& callback) override; virtual void StartSourceImpl( const media::VideoCaptureFormat& format, - const VideoCaptureDeliverFrameCB& frame_callback) OVERRIDE; + const VideoCaptureDeliverFrameCB& frame_callback) override; - virtual void StopSourceImpl() OVERRIDE; + virtual void StopSourceImpl() override; // Used by tests to test that a frame can be received and that the // MediaStreamRemoteVideoSource behaves as expected. @@ -45,7 +45,7 @@ class CONTENT_EXPORT MediaStreamRemoteVideoSource private: // webrtc::ObserverInterface implementation. - virtual void OnChanged() OVERRIDE; + virtual void OnChanged() override; scoped_refptr<webrtc::VideoTrackInterface> remote_track_; webrtc::MediaStreamTrackInterface::TrackState last_state_; diff --git a/content/renderer/media/webrtc/media_stream_remote_video_source_unittest.cc b/content/renderer/media/webrtc/media_stream_remote_video_source_unittest.cc index af2ccac..15b03f39 100644 --- a/content/renderer/media/webrtc/media_stream_remote_video_source_unittest.cc +++ b/content/renderer/media/webrtc/media_stream_remote_video_source_unittest.cc @@ -49,7 +49,7 @@ class MediaStreamRemoteVideoSourceTest webkit_source_.setExtraData(remote_source_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { webkit_source_.reset(); blink::WebHeap::collectAllGarbageForTesting(); } diff --git a/content/renderer/media/webrtc/media_stream_track_metrics.cc b/content/renderer/media/webrtc/media_stream_track_metrics.cc index 24feb2f..f13d192 100644 --- a/content/renderer/media/webrtc/media_stream_track_metrics.cc +++ b/content/renderer/media/webrtc/media_stream_track_metrics.cc @@ -39,7 +39,7 @@ class MediaStreamTrackMetricsObserver : public webrtc::ObserverInterface { typedef std::set<std::string> IdSet; // webrtc::ObserverInterface implementation. - virtual void OnChanged() OVERRIDE; + virtual void OnChanged() override; template <class T> IdSet GetTrackIds(const std::vector<rtc::scoped_refptr<T> >& tracks) { diff --git a/content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc b/content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc index c2466e8..e001c02 100644 --- a/content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc +++ b/content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc @@ -26,7 +26,7 @@ class MockAudioTrackInterface : public AudioTrackInterface { explicit MockAudioTrackInterface(const std::string& id) : id_(id) {} virtual ~MockAudioTrackInterface() {} - virtual std::string id() const OVERRIDE { return id_; } + virtual std::string id() const override { return id_; } MOCK_METHOD1(RegisterObserver, void(ObserverInterface*)); MOCK_METHOD1(UnregisterObserver, void(ObserverInterface*)); @@ -49,7 +49,7 @@ class MockVideoTrackInterface : public VideoTrackInterface { explicit MockVideoTrackInterface(const std::string& id) : id_(id) {} virtual ~MockVideoTrackInterface() {} - virtual std::string id() const OVERRIDE { return id_; } + virtual std::string id() const override { return id_; } MOCK_METHOD1(RegisterObserver, void(ObserverInterface*)); MOCK_METHOD1(UnregisterObserver, void(ObserverInterface*)); @@ -78,12 +78,12 @@ class MockMediaStreamTrackMetrics : public MediaStreamTrackMetrics { class MediaStreamTrackMetricsTest : public testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { metrics_.reset(new MockMediaStreamTrackMetrics()); stream_ = new rtc::RefCountedObject<MockMediaStream>("stream"); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { metrics_.reset(); stream_ = NULL; } diff --git a/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc b/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc index d059fc9..7d7b49f 100644 --- a/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc +++ b/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc @@ -132,7 +132,7 @@ class MockRtcVideoCapturer : public WebRtcVideoCapturerAdapter { } virtual void OnFrameCaptured( - const scoped_refptr<media::VideoFrame>& frame) OVERRIDE { + const scoped_refptr<media::VideoFrame>& frame) override { ++number_of_capturered_frames_; width_ = frame->visible_rect().width(); height_ = frame->visible_rect().height(); @@ -353,40 +353,40 @@ class MockSessionDescription : public SessionDescriptionInterface { sdp_(sdp) { } virtual ~MockSessionDescription() {} - virtual cricket::SessionDescription* description() OVERRIDE { + virtual cricket::SessionDescription* description() override { NOTIMPLEMENTED(); return NULL; } - virtual const cricket::SessionDescription* description() const OVERRIDE { + virtual const cricket::SessionDescription* description() const override { NOTIMPLEMENTED(); return NULL; } - virtual std::string session_id() const OVERRIDE { + virtual std::string session_id() const override { NOTIMPLEMENTED(); return std::string(); } - virtual std::string session_version() const OVERRIDE { + virtual std::string session_version() const override { NOTIMPLEMENTED(); return std::string(); } - virtual std::string type() const OVERRIDE { + virtual std::string type() const override { return type_; } - virtual bool AddCandidate(const IceCandidateInterface* candidate) OVERRIDE { + virtual bool AddCandidate(const IceCandidateInterface* candidate) override { NOTIMPLEMENTED(); return false; } - virtual size_t number_of_mediasections() const OVERRIDE { + virtual size_t number_of_mediasections() const override { NOTIMPLEMENTED(); return 0; } virtual const IceCandidateCollection* candidates( - size_t mediasection_index) const OVERRIDE { + size_t mediasection_index) const override { NOTIMPLEMENTED(); return NULL; } - virtual bool ToString(std::string* out) const OVERRIDE { + virtual bool ToString(std::string* out) const override { *out = sdp_; return true; } @@ -408,16 +408,16 @@ class MockIceCandidate : public IceCandidateInterface { candidate_.set_address(rtc::SocketAddress("127.0.0.1", 5000)); } virtual ~MockIceCandidate() {} - virtual std::string sdp_mid() const OVERRIDE { + virtual std::string sdp_mid() const override { return sdp_mid_; } - virtual int sdp_mline_index() const OVERRIDE { + virtual int sdp_mline_index() const override { return sdp_mline_index_; } - virtual const cricket::Candidate& candidate() const OVERRIDE { + virtual const cricket::Candidate& candidate() const override { return candidate_; } - virtual bool ToString(std::string* out) const OVERRIDE { + virtual bool ToString(std::string* out) const override { *out = sdp_; return true; } diff --git a/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h b/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h index 871c183..367fb89 100644 --- a/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h +++ b/content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h @@ -22,8 +22,8 @@ class MockVideoRenderer : public cricket::VideoRenderer { public: MockVideoRenderer(); virtual ~MockVideoRenderer(); - virtual bool SetSize(int width, int height, int reserved) OVERRIDE; - virtual bool RenderFrame(const cricket::VideoFrame* frame) OVERRIDE; + virtual bool SetSize(int width, int height, int reserved) override; + virtual bool RenderFrame(const cricket::VideoFrame* frame) override; int width() const { return width_; } int height() const { return height_; } @@ -39,14 +39,14 @@ class MockVideoSource : public webrtc::VideoSourceInterface { public: MockVideoSource(); - virtual void RegisterObserver(webrtc::ObserverInterface* observer) OVERRIDE; - virtual void UnregisterObserver(webrtc::ObserverInterface* observer) OVERRIDE; - virtual MediaSourceInterface::SourceState state() const OVERRIDE; - virtual cricket::VideoCapturer* GetVideoCapturer() OVERRIDE; - virtual void AddSink(cricket::VideoRenderer* output) OVERRIDE; - virtual void RemoveSink(cricket::VideoRenderer* output) OVERRIDE; - virtual cricket::VideoRenderer* FrameInput() OVERRIDE; - virtual const cricket::VideoOptions* options() const OVERRIDE; + virtual void RegisterObserver(webrtc::ObserverInterface* observer) override; + virtual void UnregisterObserver(webrtc::ObserverInterface* observer) override; + virtual MediaSourceInterface::SourceState state() const override; + virtual cricket::VideoCapturer* GetVideoCapturer() override; + virtual void AddSink(cricket::VideoRenderer* output) override; + virtual void RemoveSink(cricket::VideoRenderer* output) override; + virtual cricket::VideoRenderer* FrameInput() override; + virtual const cricket::VideoOptions* options() const override; // Changes the state of the source to live and notifies the observer. void SetLive(); @@ -77,9 +77,9 @@ class MockAudioSource : public webrtc::AudioSourceInterface { explicit MockAudioSource( const webrtc::MediaConstraintsInterface* constraints); - virtual void RegisterObserver(webrtc::ObserverInterface* observer) OVERRIDE; - virtual void UnregisterObserver(webrtc::ObserverInterface* observer) OVERRIDE; - virtual MediaSourceInterface::SourceState state() const OVERRIDE; + virtual void RegisterObserver(webrtc::ObserverInterface* observer) override; + virtual void UnregisterObserver(webrtc::ObserverInterface* observer) override; + virtual MediaSourceInterface::SourceState state() const override; // Changes the state of the source to live and notifies the observer. void SetLive(); @@ -109,18 +109,18 @@ class MockWebRtcVideoTrack : public webrtc::VideoTrackInterface { public: MockWebRtcVideoTrack(const std::string& id, webrtc::VideoSourceInterface* source); - virtual void AddRenderer(webrtc::VideoRendererInterface* renderer) OVERRIDE; + virtual void AddRenderer(webrtc::VideoRendererInterface* renderer) override; virtual void RemoveRenderer( - webrtc::VideoRendererInterface* renderer) OVERRIDE; - virtual std::string kind() const OVERRIDE; - virtual std::string id() const OVERRIDE; - virtual bool enabled() const OVERRIDE; - virtual TrackState state() const OVERRIDE; - virtual bool set_enabled(bool enable) OVERRIDE; - virtual bool set_state(TrackState new_state) OVERRIDE; - virtual void RegisterObserver(webrtc::ObserverInterface* observer) OVERRIDE; - virtual void UnregisterObserver(webrtc::ObserverInterface* observer) OVERRIDE; - virtual webrtc::VideoSourceInterface* GetSource() const OVERRIDE; + webrtc::VideoRendererInterface* renderer) override; + virtual std::string kind() const override; + virtual std::string id() const override; + virtual bool enabled() const override; + virtual TrackState state() const override; + virtual bool set_enabled(bool enable) override; + virtual bool set_state(TrackState new_state) override; + virtual void RegisterObserver(webrtc::ObserverInterface* observer) override; + virtual void UnregisterObserver(webrtc::ObserverInterface* observer) override; + virtual webrtc::VideoSourceInterface* GetSource() const override; protected: virtual ~MockWebRtcVideoTrack(); @@ -138,19 +138,19 @@ class MockMediaStream : public webrtc::MediaStreamInterface { public: explicit MockMediaStream(const std::string& label); - virtual bool AddTrack(webrtc::AudioTrackInterface* track) OVERRIDE; - virtual bool AddTrack(webrtc::VideoTrackInterface* track) OVERRIDE; - virtual bool RemoveTrack(webrtc::AudioTrackInterface* track) OVERRIDE; - virtual bool RemoveTrack(webrtc::VideoTrackInterface* track) OVERRIDE; - virtual std::string label() const OVERRIDE; - virtual webrtc::AudioTrackVector GetAudioTracks() OVERRIDE; - virtual webrtc::VideoTrackVector GetVideoTracks() OVERRIDE; + virtual bool AddTrack(webrtc::AudioTrackInterface* track) override; + virtual bool AddTrack(webrtc::VideoTrackInterface* track) override; + virtual bool RemoveTrack(webrtc::AudioTrackInterface* track) override; + virtual bool RemoveTrack(webrtc::VideoTrackInterface* track) override; + virtual std::string label() const override; + virtual webrtc::AudioTrackVector GetAudioTracks() override; + virtual webrtc::VideoTrackVector GetVideoTracks() override; virtual rtc::scoped_refptr<webrtc::AudioTrackInterface> - FindAudioTrack(const std::string& track_id) OVERRIDE; + FindAudioTrack(const std::string& track_id) override; virtual rtc::scoped_refptr<webrtc::VideoTrackInterface> - FindVideoTrack(const std::string& track_id) OVERRIDE; - virtual void RegisterObserver(webrtc::ObserverInterface* observer) OVERRIDE; - virtual void UnregisterObserver(webrtc::ObserverInterface* observer) OVERRIDE; + FindVideoTrack(const std::string& track_id) override; + virtual void RegisterObserver(webrtc::ObserverInterface* observer) override; + virtual void UnregisterObserver(webrtc::ObserverInterface* observer) override; protected: virtual ~MockMediaStream(); @@ -178,45 +178,45 @@ class MockPeerConnectionDependencyFactory const webrtc::PeerConnectionInterface::RTCConfiguration& config, const webrtc::MediaConstraintsInterface* constraints, blink::WebFrame* frame, - webrtc::PeerConnectionObserver* observer) OVERRIDE; + webrtc::PeerConnectionObserver* observer) override; virtual scoped_refptr<webrtc::AudioSourceInterface> CreateLocalAudioSource( - const webrtc::MediaConstraintsInterface* constraints) OVERRIDE; + const webrtc::MediaConstraintsInterface* constraints) override; virtual WebRtcVideoCapturerAdapter* CreateVideoCapturer( - bool is_screen_capture) OVERRIDE; + bool is_screen_capture) override; virtual scoped_refptr<webrtc::VideoSourceInterface> CreateVideoSource( cricket::VideoCapturer* capturer, - const blink::WebMediaConstraints& constraints) OVERRIDE; + const blink::WebMediaConstraints& constraints) override; virtual scoped_refptr<WebAudioCapturerSource> CreateWebAudioSource( - blink::WebMediaStreamSource* source) OVERRIDE; + blink::WebMediaStreamSource* source) override; virtual scoped_refptr<webrtc::MediaStreamInterface> - CreateLocalMediaStream(const std::string& label) OVERRIDE; + CreateLocalMediaStream(const std::string& label) override; virtual scoped_refptr<webrtc::VideoTrackInterface> CreateLocalVideoTrack(const std::string& id, - webrtc::VideoSourceInterface* source) OVERRIDE; + webrtc::VideoSourceInterface* source) override; virtual scoped_refptr<webrtc::VideoTrackInterface> CreateLocalVideoTrack(const std::string& id, - cricket::VideoCapturer* capturer) OVERRIDE; + cricket::VideoCapturer* capturer) override; virtual webrtc::SessionDescriptionInterface* CreateSessionDescription( const std::string& type, const std::string& sdp, - webrtc::SdpParseError* error) OVERRIDE; + webrtc::SdpParseError* error) override; virtual webrtc::IceCandidateInterface* CreateIceCandidate( const std::string& sdp_mid, int sdp_mline_index, - const std::string& sdp) OVERRIDE; + const std::string& sdp) override; virtual scoped_refptr<WebRtcAudioCapturer> CreateAudioCapturer( int render_view_id, const StreamDeviceInfo& device_info, const blink::WebMediaConstraints& constraints, - MediaStreamAudioSource* audio_source) OVERRIDE; + MediaStreamAudioSource* audio_source) override; void FailToCreateNextAudioCapturer() { fail_to_create_next_audio_capturer_ = true; } virtual void StartLocalAudioTrack( - WebRtcLocalAudioTrack* audio_track) OVERRIDE; + WebRtcLocalAudioTrack* audio_track) override; MockAudioSource* last_audio_source() { return last_audio_source_.get(); } MockVideoSource* last_video_source() { return last_video_source_.get(); } diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc index a343afb..767c35c 100644 --- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc +++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc @@ -125,7 +125,7 @@ class P2PPortAllocatorFactory : public webrtc::PortAllocatorFactoryInterface { virtual cricket::PortAllocator* CreatePortAllocator( const std::vector<StunConfiguration>& stun_servers, - const std::vector<TurnConfiguration>& turn_configurations) OVERRIDE { + const std::vector<TurnConfiguration>& turn_configurations) override { P2PPortAllocator::Config config; for (size_t i = 0; i < stun_servers.size(); ++i) { config.stun_servers.insert(rtc::SocketAddress( diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.h b/content/renderer/media/webrtc/peer_connection_dependency_factory.h index a8c96ca..694fd2f0 100644 --- a/content/renderer/media/webrtc/peer_connection_dependency_factory.h +++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.h @@ -134,9 +134,9 @@ class CONTENT_EXPORT PeerConnectionDependencyFactory // TODO(xians): Remove when option to disable audio track processing is // removed. virtual void OnAecDumpFile( - const IPC::PlatformFileForTransit& file_handle) OVERRIDE; - virtual void OnDisableAecDump() OVERRIDE; - virtual void OnIpcClosing() OVERRIDE; + const IPC::PlatformFileForTransit& file_handle) override; + virtual void OnDisableAecDump() override; + virtual void OnIpcClosing() override; protected: // Asks the PeerConnection factory to create a Local Audio Source. diff --git a/content/renderer/media/webrtc/video_destination_handler.cc b/content/renderer/media/webrtc/video_destination_handler.cc index 02dfe32..88d0fa3 100644 --- a/content/renderer/media/webrtc/video_destination_handler.cc +++ b/content/renderer/media/webrtc/video_destination_handler.cc @@ -177,7 +177,7 @@ class PpFrameWriterProxy : public FrameWriterInterface { virtual ~PpFrameWriterProxy() {} virtual void PutFrame(PPB_ImageData_Impl* image_data, - int64 time_stamp_ns) OVERRIDE { + int64 time_stamp_ns) override { writer_->PutFrame(image_data, time_stamp_ns); } diff --git a/content/renderer/media/webrtc/video_destination_handler.h b/content/renderer/media/webrtc/video_destination_handler.h index 7981401..0a9ab85 100644 --- a/content/renderer/media/webrtc/video_destination_handler.h +++ b/content/renderer/media/webrtc/video_destination_handler.h @@ -46,18 +46,18 @@ class CONTENT_EXPORT PpFrameWriter // FrameWriterInterface implementation. // This method will be called by the Pepper host from render thread. virtual void PutFrame(PPB_ImageData_Impl* image_data, - int64 time_stamp_ns) OVERRIDE; + int64 time_stamp_ns) override; protected: // MediaStreamVideoSource implementation. virtual void GetCurrentSupportedFormats( int max_requested_width, int max_requested_height, double max_requested_frame_rate, - const VideoCaptureDeviceFormatsCB& callback) OVERRIDE; + const VideoCaptureDeviceFormatsCB& callback) override; virtual void StartSourceImpl( const media::VideoCaptureFormat& format, - const VideoCaptureDeliverFrameCB& frame_callback) OVERRIDE; - virtual void StopSourceImpl() OVERRIDE; + const VideoCaptureDeliverFrameCB& frame_callback) override; + virtual void StopSourceImpl() override; private: media::VideoFramePool frame_pool_; diff --git a/content/renderer/media/webrtc/video_destination_handler_unittest.cc b/content/renderer/media/webrtc/video_destination_handler_unittest.cc index 041071f..dc0dd8c 100644 --- a/content/renderer/media/webrtc/video_destination_handler_unittest.cc +++ b/content/renderer/media/webrtc/video_destination_handler_unittest.cc @@ -41,7 +41,7 @@ class VideoDestinationHandlerTest : public PpapiUnittest { registry_->Init(kTestStreamUrl); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { registry_.reset(); blink::WebHeap::collectAllGarbageForTesting(); PpapiUnittest::TearDown(); diff --git a/content/renderer/media/webrtc/webrtc_audio_sink_adapter.h b/content/renderer/media/webrtc/webrtc_audio_sink_adapter.h index c1be09a..d0cc777 100644 --- a/content/renderer/media/webrtc/webrtc_audio_sink_adapter.h +++ b/content/renderer/media/webrtc/webrtc_audio_sink_adapter.h @@ -32,8 +32,8 @@ class WebRtcAudioSinkAdapter : public MediaStreamAudioSink { virtual void OnData(const int16* audio_data, int sample_rate, int number_of_channels, - int number_of_frames) OVERRIDE; - virtual void OnSetFormat(const media::AudioParameters& params) OVERRIDE; + int number_of_frames) override; + virtual void OnSetFormat(const media::AudioParameters& params) override; webrtc::AudioTrackSinkInterface* const sink_; diff --git a/content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h b/content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h index 630af24..fc4f52d 100644 --- a/content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h +++ b/content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h @@ -61,22 +61,22 @@ class CONTENT_EXPORT WebRtcLocalAudioTrackAdapter private: // webrtc::MediaStreamTrack implementation. - virtual std::string kind() const OVERRIDE; + virtual std::string kind() const override; // webrtc::AudioTrackInterface implementation. - virtual void AddSink(webrtc::AudioTrackSinkInterface* sink) OVERRIDE; - virtual void RemoveSink(webrtc::AudioTrackSinkInterface* sink) OVERRIDE; - virtual bool GetSignalLevel(int* level) OVERRIDE; + virtual void AddSink(webrtc::AudioTrackSinkInterface* sink) override; + virtual void RemoveSink(webrtc::AudioTrackSinkInterface* sink) override; + virtual bool GetSignalLevel(int* level) override; virtual rtc::scoped_refptr<webrtc::AudioProcessorInterface> - GetAudioProcessor() OVERRIDE; + GetAudioProcessor() override; // cricket::AudioCapturer implementation. - virtual void AddChannel(int channel_id) OVERRIDE; - virtual void RemoveChannel(int channel_id) OVERRIDE; + virtual void AddChannel(int channel_id) override; + virtual void RemoveChannel(int channel_id) override; // webrtc::AudioTrackInterface implementation. - virtual webrtc::AudioSourceInterface* GetSource() const OVERRIDE; - virtual cricket::AudioRenderer* GetRenderer() OVERRIDE; + virtual webrtc::AudioSourceInterface* GetSource() const override; + virtual cricket::AudioRenderer* GetRenderer() override; // Weak reference. WebRtcLocalAudioTrack* owner_; diff --git a/content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc b/content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc index a145c43..f4a037c 100644 --- a/content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc +++ b/content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc @@ -45,7 +45,7 @@ class WebRtcLocalAudioTrackAdapterTest : public ::testing::Test { } protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { track_->OnSetFormat(params_); EXPECT_TRUE(track_->GetAudioAdapter()->enabled()); } diff --git a/content/renderer/media/webrtc/webrtc_media_stream_adapter.h b/content/renderer/media/webrtc/webrtc_media_stream_adapter.h index d598322..6afa1c8 100644 --- a/content/renderer/media/webrtc/webrtc_media_stream_adapter.h +++ b/content/renderer/media/webrtc/webrtc_media_stream_adapter.h @@ -43,8 +43,8 @@ class CONTENT_EXPORT WebRtcMediaStreamAdapter protected: // MediaStreamObserver implementation. - virtual void TrackAdded(const blink::WebMediaStreamTrack& track) OVERRIDE; - virtual void TrackRemoved(const blink::WebMediaStreamTrack& track) OVERRIDE; + virtual void TrackAdded(const blink::WebMediaStreamTrack& track) override; + virtual void TrackRemoved(const blink::WebMediaStreamTrack& track) override; private: void CreateAudioTrack(const blink::WebMediaStreamTrack& track); diff --git a/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc b/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc index 99b3f4e..745af66 100644 --- a/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc +++ b/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc @@ -29,7 +29,7 @@ class WebRtcMediaStreamAdapterTest : public ::testing::Test { dependency_factory_.reset(new MockPeerConnectionDependencyFactory()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { adapter_.reset(); blink::WebHeap::collectAllGarbageForTesting(); } diff --git a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h index e007b33..5224552 100644 --- a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h +++ b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.h @@ -40,13 +40,13 @@ class CONTENT_EXPORT WebRtcVideoCapturerAdapter // cricket::VideoCapturer implementation. // These methods are accessed from a libJingle worker thread. virtual cricket::CaptureState Start( - const cricket::VideoFormat& capture_format) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual bool IsRunning() OVERRIDE; - virtual bool GetPreferredFourccs(std::vector<uint32>* fourccs) OVERRIDE; + const cricket::VideoFormat& capture_format) override; + virtual void Stop() override; + virtual bool IsRunning() override; + virtual bool GetPreferredFourccs(std::vector<uint32>* fourccs) override; virtual bool GetBestCaptureFormat(const cricket::VideoFormat& desired, - cricket::VideoFormat* best_format) OVERRIDE; - virtual bool IsScreencast() const OVERRIDE; + cricket::VideoFormat* best_format) override; + virtual bool IsScreencast() const override; void UpdateI420Buffer(const scoped_refptr<media::VideoFrame>& src); diff --git a/content/renderer/media/webrtc/webrtc_video_track_adapter.h b/content/renderer/media/webrtc/webrtc_video_track_adapter.h index 0ff7a6f..f64e1e9 100644 --- a/content/renderer/media/webrtc/webrtc_video_track_adapter.h +++ b/content/renderer/media/webrtc/webrtc_video_track_adapter.h @@ -39,7 +39,7 @@ class WebRtcVideoTrackAdapter : public MediaStreamVideoSink { protected: // Implementation of MediaStreamSink. - virtual void OnEnabledChanged(bool enabled) OVERRIDE; + virtual void OnEnabledChanged(bool enabled) override; private: // Used to DCHECK that we are called on the correct thread. diff --git a/content/renderer/media/webrtc_audio_capturer.h b/content/renderer/media/webrtc_audio_capturer.h index d77a107..0c1bc00 100644 --- a/content/renderer/media/webrtc_audio_capturer.h +++ b/content/renderer/media/webrtc_audio_capturer.h @@ -136,8 +136,8 @@ class CONTENT_EXPORT WebRtcAudioCapturer virtual void Capture(const media::AudioBus* audio_source, int audio_delay_milliseconds, double volume, - bool key_pressed) OVERRIDE; - virtual void OnCaptureError() OVERRIDE; + bool key_pressed) override; + virtual void OnCaptureError() override; // Initializes the default audio capturing source using the provided render // view id and device information. Return true if success, otherwise false. diff --git a/content/renderer/media/webrtc_audio_capturer_unittest.cc b/content/renderer/media/webrtc_audio_capturer_unittest.cc index ded95d6..9b27410 100644 --- a/content/renderer/media/webrtc_audio_capturer_unittest.cc +++ b/content/renderer/media/webrtc_audio_capturer_unittest.cc @@ -45,7 +45,7 @@ class MockPeerConnectionAudioSink : public PeerConnectionAudioSink { int number_of_channels, int number_of_frames, const std::vector<int>& channels, int audio_delay_milliseconds, int current_volume, - bool need_audio_processing, bool key_pressed) OVERRIDE { + bool need_audio_processing, bool key_pressed) override { EXPECT_EQ(sample_rate, params_.sample_rate()); EXPECT_EQ(number_of_channels, params_.channels()); EXPECT_EQ(number_of_frames, params_.frames_per_buffer()); @@ -59,7 +59,7 @@ class MockPeerConnectionAudioSink : public PeerConnectionAudioSink { int current_volume, bool need_audio_processing, bool key_pressed)); - virtual void OnSetFormat(const media::AudioParameters& params) OVERRIDE { + virtual void OnSetFormat(const media::AudioParameters& params) override { params_ = params; FormatIsSet(); } diff --git a/content/renderer/media/webrtc_audio_device_impl.h b/content/renderer/media/webrtc_audio_device_impl.h index e53125d..77b837c 100644 --- a/content/renderer/media/webrtc_audio_device_impl.h +++ b/content/renderer/media/webrtc_audio_device_impl.h @@ -283,47 +283,47 @@ class CONTENT_EXPORT WebRtcAudioDeviceImpl // The creator must call AddRef() after construction and use Release() // to release the reference and delete this object. // Called on the main render thread. - virtual int32_t AddRef() OVERRIDE; - virtual int32_t Release() OVERRIDE; + virtual int32_t AddRef() override; + virtual int32_t Release() override; // webrtc::AudioDeviceModule implementation. // All implemented methods are called on the main render thread unless // anything else is stated. virtual int32_t RegisterAudioCallback(webrtc::AudioTransport* audio_callback) - OVERRIDE; + override; - virtual int32_t Init() OVERRIDE; - virtual int32_t Terminate() OVERRIDE; - virtual bool Initialized() const OVERRIDE; + virtual int32_t Init() override; + virtual int32_t Terminate() override; + virtual bool Initialized() const override; - virtual int32_t PlayoutIsAvailable(bool* available) OVERRIDE; - virtual bool PlayoutIsInitialized() const OVERRIDE; - virtual int32_t RecordingIsAvailable(bool* available) OVERRIDE; - virtual bool RecordingIsInitialized() const OVERRIDE; + virtual int32_t PlayoutIsAvailable(bool* available) override; + virtual bool PlayoutIsInitialized() const override; + virtual int32_t RecordingIsAvailable(bool* available) override; + virtual bool RecordingIsInitialized() const override; // All Start/Stop methods are called on a libJingle worker thread. - virtual int32_t StartPlayout() OVERRIDE; - virtual int32_t StopPlayout() OVERRIDE; - virtual bool Playing() const OVERRIDE; - virtual int32_t StartRecording() OVERRIDE; - virtual int32_t StopRecording() OVERRIDE; - virtual bool Recording() const OVERRIDE; + virtual int32_t StartPlayout() override; + virtual int32_t StopPlayout() override; + virtual bool Playing() const override; + virtual int32_t StartRecording() override; + virtual int32_t StopRecording() override; + virtual bool Recording() const override; // Called on the AudioInputDevice worker thread. - virtual int32_t SetMicrophoneVolume(uint32_t volume) OVERRIDE; + virtual int32_t SetMicrophoneVolume(uint32_t volume) override; // TODO(henrika): sort out calling thread once we start using this API. - virtual int32_t MicrophoneVolume(uint32_t* volume) const OVERRIDE; + virtual int32_t MicrophoneVolume(uint32_t* volume) const override; - virtual int32_t MaxMicrophoneVolume(uint32_t* max_volume) const OVERRIDE; - virtual int32_t MinMicrophoneVolume(uint32_t* min_volume) const OVERRIDE; - virtual int32_t StereoPlayoutIsAvailable(bool* available) const OVERRIDE; - virtual int32_t StereoRecordingIsAvailable(bool* available) const OVERRIDE; - virtual int32_t PlayoutDelay(uint16_t* delay_ms) const OVERRIDE; - virtual int32_t RecordingDelay(uint16_t* delay_ms) const OVERRIDE; - virtual int32_t RecordingSampleRate(uint32_t* sample_rate) const OVERRIDE; - virtual int32_t PlayoutSampleRate(uint32_t* sample_rate) const OVERRIDE; + virtual int32_t MaxMicrophoneVolume(uint32_t* max_volume) const override; + virtual int32_t MinMicrophoneVolume(uint32_t* min_volume) const override; + virtual int32_t StereoPlayoutIsAvailable(bool* available) const override; + virtual int32_t StereoRecordingIsAvailable(bool* available) const override; + virtual int32_t PlayoutDelay(uint16_t* delay_ms) const override; + virtual int32_t RecordingDelay(uint16_t* delay_ms) const override; + virtual int32_t RecordingSampleRate(uint32_t* sample_rate) const override; + virtual int32_t PlayoutSampleRate(uint32_t* sample_rate) const override; // Sets the |renderer_|, returns false if |renderer_| already exists. // Called on the main renderer thread. @@ -372,10 +372,10 @@ class CONTENT_EXPORT WebRtcAudioDeviceImpl int audio_delay_milliseconds, int current_volume, bool need_audio_processing, - bool key_pressed) OVERRIDE; + bool key_pressed) override; // Called on the AudioInputDevice worker thread. - virtual void OnSetFormat(const media::AudioParameters& params) OVERRIDE; + virtual void OnSetFormat(const media::AudioParameters& params) override; // WebRtcAudioRendererSource implementation. @@ -383,14 +383,14 @@ class CONTENT_EXPORT WebRtcAudioDeviceImpl virtual void RenderData(media::AudioBus* audio_bus, int sample_rate, int audio_delay_milliseconds, - base::TimeDelta* current_time) OVERRIDE; + base::TimeDelta* current_time) override; // Called on the main render thread. - virtual void RemoveAudioRenderer(WebRtcAudioRenderer* renderer) OVERRIDE; + virtual void RemoveAudioRenderer(WebRtcAudioRenderer* renderer) override; // WebRtcPlayoutDataSource implementation. - virtual void AddPlayoutSink(WebRtcPlayoutDataSource::Sink* sink) OVERRIDE; - virtual void RemovePlayoutSink(WebRtcPlayoutDataSource::Sink* sink) OVERRIDE; + virtual void AddPlayoutSink(WebRtcPlayoutDataSource::Sink* sink) override; + virtual void RemovePlayoutSink(WebRtcPlayoutDataSource::Sink* sink) override; // Used to DCHECK that we are called on the correct thread. base::ThreadChecker thread_checker_; diff --git a/content/renderer/media/webrtc_audio_device_not_impl.h b/content/renderer/media/webrtc_audio_device_not_impl.h index fad4f3f..dc7fc8c 100644 --- a/content/renderer/media/webrtc_audio_device_not_impl.h +++ b/content/renderer/media/webrtc_audio_device_not_impl.h @@ -28,84 +28,84 @@ class CONTENT_EXPORT WebRtcAudioDeviceNotImpl // TODO(henrika): it is possible to add functionality in these methods. // Only adding very basic support for now without triggering any callback // in the webrtc::AudioDeviceObserver interface. - virtual int32_t ChangeUniqueId(const int32_t id) OVERRIDE; - virtual int32_t TimeUntilNextProcess() OVERRIDE; - virtual int32_t Process() OVERRIDE; + virtual int32_t ChangeUniqueId(const int32_t id) override; + virtual int32_t TimeUntilNextProcess() override; + virtual int32_t Process() override; // Methods in webrtc::AudioDeviceModule which are not yet implemented. // The idea is that we can move methods from this class to the real // implementation in WebRtcAudioDeviceImpl when needed. virtual int32_t RegisterEventObserver( - webrtc::AudioDeviceObserver* event_callback) OVERRIDE; - virtual int32_t ActiveAudioLayer(AudioLayer* audio_layer) const OVERRIDE; - virtual webrtc::AudioDeviceModule::ErrorCode LastError() const OVERRIDE; - virtual int16_t PlayoutDevices() OVERRIDE; - virtual int16_t RecordingDevices() OVERRIDE; + webrtc::AudioDeviceObserver* event_callback) override; + virtual int32_t ActiveAudioLayer(AudioLayer* audio_layer) const override; + virtual webrtc::AudioDeviceModule::ErrorCode LastError() const override; + virtual int16_t PlayoutDevices() override; + virtual int16_t RecordingDevices() override; virtual int32_t PlayoutDeviceName( uint16_t index, char name[webrtc::kAdmMaxDeviceNameSize], - char guid[webrtc::kAdmMaxGuidSize]) OVERRIDE; + char guid[webrtc::kAdmMaxGuidSize]) override; virtual int32_t RecordingDeviceName( uint16_t index, char name[webrtc::kAdmMaxDeviceNameSize], - char guid[webrtc::kAdmMaxGuidSize]) OVERRIDE; - virtual int32_t SetPlayoutDevice(uint16_t index) OVERRIDE; - virtual int32_t SetPlayoutDevice(WindowsDeviceType device) OVERRIDE; - virtual int32_t SetRecordingDevice(uint16_t index) OVERRIDE; - virtual int32_t SetRecordingDevice(WindowsDeviceType device) OVERRIDE; - virtual int32_t InitPlayout() OVERRIDE; - virtual int32_t InitRecording() OVERRIDE; + char guid[webrtc::kAdmMaxGuidSize]) override; + virtual int32_t SetPlayoutDevice(uint16_t index) override; + virtual int32_t SetPlayoutDevice(WindowsDeviceType device) override; + virtual int32_t SetRecordingDevice(uint16_t index) override; + virtual int32_t SetRecordingDevice(WindowsDeviceType device) override; + virtual int32_t InitPlayout() override; + virtual int32_t InitRecording() override; virtual int32_t SetWaveOutVolume(uint16_t volume_left, - uint16_t volume_right) OVERRIDE; + uint16_t volume_right) override; virtual int32_t WaveOutVolume(uint16_t* volume_left, - uint16_t* volume_right) const OVERRIDE; - virtual int32_t InitSpeaker() OVERRIDE; - virtual bool SpeakerIsInitialized() const OVERRIDE; - virtual int32_t InitMicrophone() OVERRIDE; - virtual bool MicrophoneIsInitialized() const OVERRIDE; - virtual int32_t SpeakerVolumeIsAvailable(bool* available) OVERRIDE; - virtual int32_t SetSpeakerVolume(uint32_t volume) OVERRIDE; - virtual int32_t SpeakerVolume(uint32_t* volume) const OVERRIDE; - virtual int32_t MaxSpeakerVolume(uint32_t* max_volume) const OVERRIDE; - virtual int32_t MinSpeakerVolume(uint32_t* min_volume) const OVERRIDE; - virtual int32_t SpeakerVolumeStepSize(uint16_t* step_size) const OVERRIDE; - virtual int32_t MicrophoneVolumeIsAvailable(bool* available) OVERRIDE; + uint16_t* volume_right) const override; + virtual int32_t InitSpeaker() override; + virtual bool SpeakerIsInitialized() const override; + virtual int32_t InitMicrophone() override; + virtual bool MicrophoneIsInitialized() const override; + virtual int32_t SpeakerVolumeIsAvailable(bool* available) override; + virtual int32_t SetSpeakerVolume(uint32_t volume) override; + virtual int32_t SpeakerVolume(uint32_t* volume) const override; + virtual int32_t MaxSpeakerVolume(uint32_t* max_volume) const override; + virtual int32_t MinSpeakerVolume(uint32_t* min_volume) const override; + virtual int32_t SpeakerVolumeStepSize(uint16_t* step_size) const override; + virtual int32_t MicrophoneVolumeIsAvailable(bool* available) override; virtual int32_t MicrophoneVolumeStepSize( - uint16_t* step_size) const OVERRIDE; - virtual int32_t SpeakerMuteIsAvailable(bool* available) OVERRIDE; - virtual int32_t SetSpeakerMute(bool enable) OVERRIDE; - virtual int32_t SpeakerMute(bool* enabled) const OVERRIDE; - virtual int32_t MicrophoneMuteIsAvailable(bool* available) OVERRIDE; - virtual int32_t SetMicrophoneMute(bool enable) OVERRIDE; - virtual int32_t MicrophoneMute(bool* enabled) const OVERRIDE; - virtual int32_t MicrophoneBoostIsAvailable(bool* available) OVERRIDE; - virtual int32_t SetMicrophoneBoost(bool enable) OVERRIDE; - virtual int32_t MicrophoneBoost(bool* enabled) const OVERRIDE; - virtual int32_t SetStereoPlayout(bool enable) OVERRIDE; - virtual int32_t StereoPlayout(bool* enabled) const OVERRIDE; - virtual int32_t SetStereoRecording(bool enable) OVERRIDE; - virtual int32_t StereoRecording(bool* enabled) const OVERRIDE; - virtual int32_t SetRecordingChannel(const ChannelType channel) OVERRIDE; - virtual int32_t RecordingChannel(ChannelType* channel) const OVERRIDE; + uint16_t* step_size) const override; + virtual int32_t SpeakerMuteIsAvailable(bool* available) override; + virtual int32_t SetSpeakerMute(bool enable) override; + virtual int32_t SpeakerMute(bool* enabled) const override; + virtual int32_t MicrophoneMuteIsAvailable(bool* available) override; + virtual int32_t SetMicrophoneMute(bool enable) override; + virtual int32_t MicrophoneMute(bool* enabled) const override; + virtual int32_t MicrophoneBoostIsAvailable(bool* available) override; + virtual int32_t SetMicrophoneBoost(bool enable) override; + virtual int32_t MicrophoneBoost(bool* enabled) const override; + virtual int32_t SetStereoPlayout(bool enable) override; + virtual int32_t StereoPlayout(bool* enabled) const override; + virtual int32_t SetStereoRecording(bool enable) override; + virtual int32_t StereoRecording(bool* enabled) const override; + virtual int32_t SetRecordingChannel(const ChannelType channel) override; + virtual int32_t RecordingChannel(ChannelType* channel) const override; virtual int32_t SetPlayoutBuffer( - const BufferType type, uint16_t size_ms) OVERRIDE; + const BufferType type, uint16_t size_ms) override; virtual int32_t PlayoutBuffer( - BufferType* type, uint16_t* size_ms) const OVERRIDE; - virtual int32_t CPULoad(uint16_t* load) const OVERRIDE; + BufferType* type, uint16_t* size_ms) const override; + virtual int32_t CPULoad(uint16_t* load) const override; virtual int32_t StartRawOutputFileRecording( - const char pcm_file_name_utf8[webrtc::kAdmMaxFileNameSize]) OVERRIDE; - virtual int32_t StopRawOutputFileRecording() OVERRIDE; + const char pcm_file_name_utf8[webrtc::kAdmMaxFileNameSize]) override; + virtual int32_t StopRawOutputFileRecording() override; virtual int32_t StartRawInputFileRecording( - const char pcm_file_name_utf8[webrtc::kAdmMaxFileNameSize]) OVERRIDE; - virtual int32_t StopRawInputFileRecording() OVERRIDE; + const char pcm_file_name_utf8[webrtc::kAdmMaxFileNameSize]) override; + virtual int32_t StopRawInputFileRecording() override; virtual int32_t SetRecordingSampleRate( - const uint32_t samples_per_sec) OVERRIDE; + const uint32_t samples_per_sec) override; virtual int32_t SetPlayoutSampleRate( - const uint32_t samples_per_sec) OVERRIDE; - virtual int32_t ResetAudioDevice() OVERRIDE; - virtual int32_t SetLoudspeakerStatus(bool enable) OVERRIDE; - virtual int32_t GetLoudspeakerStatus(bool* enabled) const OVERRIDE; - virtual int32_t SetAGC(bool enable) OVERRIDE; - virtual bool AGC() const OVERRIDE; + const uint32_t samples_per_sec) override; + virtual int32_t ResetAudioDevice() override; + virtual int32_t SetLoudspeakerStatus(bool enable) override; + virtual int32_t GetLoudspeakerStatus(bool* enabled) const override; + virtual int32_t SetAGC(bool enable) override; + virtual bool AGC() const override; protected: virtual ~WebRtcAudioDeviceNotImpl() {}; diff --git a/content/renderer/media/webrtc_audio_renderer.cc b/content/renderer/media/webrtc_audio_renderer.cc index 694738c..f409d5f 100644 --- a/content/renderer/media/webrtc_audio_renderer.cc +++ b/content/renderer/media/webrtc_audio_renderer.cc @@ -64,7 +64,7 @@ class SharedAudioRenderer : public MediaStreamAudioRenderer { Stop(); } - virtual void Start() OVERRIDE { + virtual void Start() override { DCHECK(thread_checker_.CalledOnValidThread()); if (started_) return; @@ -72,7 +72,7 @@ class SharedAudioRenderer : public MediaStreamAudioRenderer { delegate_->Start(); } - virtual void Play() OVERRIDE { + virtual void Play() override { DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(started_); if (playing_state_.playing()) @@ -81,7 +81,7 @@ class SharedAudioRenderer : public MediaStreamAudioRenderer { on_play_state_changed_.Run(media_stream_, &playing_state_); } - virtual void Pause() OVERRIDE { + virtual void Pause() override { DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(started_); if (!playing_state_.playing()) @@ -90,7 +90,7 @@ class SharedAudioRenderer : public MediaStreamAudioRenderer { on_play_state_changed_.Run(media_stream_, &playing_state_); } - virtual void Stop() OVERRIDE { + virtual void Stop() override { DCHECK(thread_checker_.CalledOnValidThread()); if (!started_) return; @@ -99,19 +99,19 @@ class SharedAudioRenderer : public MediaStreamAudioRenderer { delegate_->Stop(); } - virtual void SetVolume(float volume) OVERRIDE { + virtual void SetVolume(float volume) override { DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(volume >= 0.0f && volume <= 1.0f); playing_state_.set_volume(volume); on_play_state_changed_.Run(media_stream_, &playing_state_); } - virtual base::TimeDelta GetCurrentRenderTime() const OVERRIDE { + virtual base::TimeDelta GetCurrentRenderTime() const override { DCHECK(thread_checker_.CalledOnValidThread()); return delegate_->GetCurrentRenderTime(); } - virtual bool IsLocalRenderer() const OVERRIDE { + virtual bool IsLocalRenderer() const override { DCHECK(thread_checker_.CalledOnValidThread()); return delegate_->IsLocalRenderer(); } diff --git a/content/renderer/media/webrtc_audio_renderer.h b/content/renderer/media/webrtc_audio_renderer.h index ceac53f..08140bb 100644 --- a/content/renderer/media/webrtc_audio_renderer.h +++ b/content/renderer/media/webrtc_audio_renderer.h @@ -105,13 +105,13 @@ class CONTENT_EXPORT WebRtcAudioRenderer // MediaStreamAudioRenderer implementation. This is private since we want // callers to use proxy objects. // TODO(tommi): Make the MediaStreamAudioRenderer implementation a pimpl? - virtual void Start() OVERRIDE; - virtual void Play() OVERRIDE; - virtual void Pause() OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void SetVolume(float volume) OVERRIDE; - virtual base::TimeDelta GetCurrentRenderTime() const OVERRIDE; - virtual bool IsLocalRenderer() const OVERRIDE; + virtual void Start() override; + virtual void Play() override; + virtual void Pause() override; + virtual void Stop() override; + virtual void SetVolume(float volume) override; + virtual base::TimeDelta GetCurrentRenderTime() const override; + virtual bool IsLocalRenderer() const override; // Called when an audio renderer, either the main or a proxy, starts playing. // Here we maintain a reference count of how many renderers are currently @@ -150,8 +150,8 @@ class CONTENT_EXPORT WebRtcAudioRenderer // media::AudioRendererSink::RenderCallback implementation. // These two methods are called on the AudioOutputDevice worker thread. virtual int Render(media::AudioBus* audio_bus, - int audio_delay_milliseconds) OVERRIDE; - virtual void OnRenderError() OVERRIDE; + int audio_delay_milliseconds) override; + virtual void OnRenderError() override; // Called by AudioPullFifo when more data is necessary. // This method is called on the AudioOutputDevice worker thread. diff --git a/content/renderer/media/webrtc_identity_service.h b/content/renderer/media/webrtc_identity_service.h index 756148e..422c500 100644 --- a/content/renderer/media/webrtc_identity_service.h +++ b/content/renderer/media/webrtc_identity_service.h @@ -58,7 +58,7 @@ class CONTENT_EXPORT WebRTCIdentityService : public RenderProcessObserver { // For unittest to override. virtual bool Send(IPC::Message* message); // RenderProcessObserver implementation. Protected for testing. - virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnControlMessageReceived(const IPC::Message& message) override; private: struct RequestInfo { diff --git a/content/renderer/media/webrtc_identity_service_unittest.cc b/content/renderer/media/webrtc_identity_service_unittest.cc index 856865d..b706258 100644 --- a/content/renderer/media/webrtc_identity_service_unittest.cc +++ b/content/renderer/media/webrtc_identity_service_unittest.cc @@ -22,13 +22,13 @@ static const int FAKE_ERROR = 100; class WebRTCIdentityServiceForTest : public WebRTCIdentityService { public: - virtual bool Send(IPC::Message* message) OVERRIDE { + virtual bool Send(IPC::Message* message) override { messages_.push_back(*message); delete message; return true; } - virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE { + virtual bool OnControlMessageReceived(const IPC::Message& message) override { return WebRTCIdentityService::OnControlMessageReceived(message); } diff --git a/content/renderer/media/webrtc_local_audio_renderer.h b/content/renderer/media/webrtc_local_audio_renderer.h index 58da881..271e71b 100644 --- a/content/renderer/media/webrtc_local_audio_renderer.h +++ b/content/renderer/media/webrtc_local_audio_renderer.h @@ -58,13 +58,13 @@ class CONTENT_EXPORT WebRtcLocalAudioRenderer // MediaStreamAudioRenderer implementation. // Called on the main thread. - virtual void Start() OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Play() OVERRIDE; - virtual void Pause() OVERRIDE; - virtual void SetVolume(float volume) OVERRIDE; - virtual base::TimeDelta GetCurrentRenderTime() const OVERRIDE; - virtual bool IsLocalRenderer() const OVERRIDE; + virtual void Start() override; + virtual void Stop() override; + virtual void Play() override; + virtual void Pause() override; + virtual void SetVolume(float volume) override; + virtual base::TimeDelta GetCurrentRenderTime() const override; + virtual bool IsLocalRenderer() const override; const base::TimeDelta& total_render_time() const { return total_render_time_; @@ -80,17 +80,17 @@ class CONTENT_EXPORT WebRtcLocalAudioRenderer virtual void OnData(const int16* audio_data, int sample_rate, int number_of_channels, - int number_of_frames) OVERRIDE; + int number_of_frames) override; // Called on the AudioInputDevice worker thread. - virtual void OnSetFormat(const media::AudioParameters& params) OVERRIDE; + virtual void OnSetFormat(const media::AudioParameters& params) override; // media::AudioRendererSink::RenderCallback implementation. // Render() is called on the AudioOutputDevice thread and OnRenderError() // on the IO thread. virtual int Render(media::AudioBus* audio_bus, - int audio_delay_milliseconds) OVERRIDE; - virtual void OnRenderError() OVERRIDE; + int audio_delay_milliseconds) override; + virtual void OnRenderError() override; // Initializes and starts the |sink_| if // we have received valid |source_params_| && diff --git a/content/renderer/media/webrtc_local_audio_source_provider.h b/content/renderer/media/webrtc_local_audio_source_provider.h index 9abd89f..e813cbe 100644 --- a/content/renderer/media/webrtc_local_audio_source_provider.h +++ b/content/renderer/media/webrtc_local_audio_source_provider.h @@ -56,21 +56,21 @@ class CONTENT_EXPORT WebRtcLocalAudioSourceProvider virtual void OnData(const int16* audio_data, int sample_rate, int number_of_channels, - int number_of_frames) OVERRIDE; - virtual void OnSetFormat(const media::AudioParameters& params) OVERRIDE; + int number_of_frames) override; + virtual void OnSetFormat(const media::AudioParameters& params) override; virtual void OnReadyStateChanged( - blink::WebMediaStreamSource::ReadyState state) OVERRIDE; + blink::WebMediaStreamSource::ReadyState state) override; // blink::WebAudioSourceProvider implementation. - virtual void setClient(blink::WebAudioSourceProviderClient* client) OVERRIDE; + virtual void setClient(blink::WebAudioSourceProviderClient* client) override; virtual void provideInput(const blink::WebVector<float*>& audio_data, - size_t number_of_frames) OVERRIDE; + size_t number_of_frames) override; // media::AudioConverter::Inputcallback implementation. // This function is triggered by provideInput()on the WebAudio audio thread, // so it has been under the protection of |lock_|. virtual double ProvideInput(media::AudioBus* audio_bus, - base::TimeDelta buffer_delay) OVERRIDE; + base::TimeDelta buffer_delay) override; // Method to allow the unittests to inject its own sink parameters to avoid // query the hardware. diff --git a/content/renderer/media/webrtc_local_audio_source_provider_unittest.cc b/content/renderer/media/webrtc_local_audio_source_provider_unittest.cc index 0c3b0be..2721f6c 100644 --- a/content/renderer/media/webrtc_local_audio_source_provider_unittest.cc +++ b/content/renderer/media/webrtc_local_audio_source_provider_unittest.cc @@ -19,7 +19,7 @@ namespace content { class WebRtcLocalAudioSourceProviderTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { source_params_.Reset(media::AudioParameters::AUDIO_PCM_LOW_LATENCY, media::CHANNEL_LAYOUT_MONO, 1, 48000, 16, 480); sink_params_.Reset( @@ -51,7 +51,7 @@ class WebRtcLocalAudioSourceProviderTest : public testing::Test { source_provider_->OnSetFormat(source_params_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { source_provider_.reset(); blink_track_.reset(); blink::WebHeap::collectAllGarbageForTesting(); diff --git a/content/renderer/media/webrtc_local_audio_track.h b/content/renderer/media/webrtc_local_audio_track.h index c2cb81b..7697ddf 100644 --- a/content/renderer/media/webrtc_local_audio_track.h +++ b/content/renderer/media/webrtc_local_audio_track.h @@ -62,7 +62,7 @@ class CONTENT_EXPORT WebRtcLocalAudioTrack // Stops the local audio track. Called on the main render thread and // should be called only once when audio track going away. - virtual void Stop() OVERRIDE; + virtual void Stop() override; // Method called by the capturer to deliver the capture data. // Called on the capture audio thread. diff --git a/content/renderer/media/webrtc_local_audio_track_unittest.cc b/content/renderer/media/webrtc_local_audio_track_unittest.cc index d3d074b..79eecf0 100644 --- a/content/renderer/media/webrtc_local_audio_track_unittest.cc +++ b/content/renderer/media/webrtc_local_audio_track_unittest.cc @@ -48,7 +48,7 @@ class FakeAudioThread : public base::PlatformThread::Delegate { virtual ~FakeAudioThread() { DCHECK(thread_.is_null()); } // base::PlatformThread::Delegate: - virtual void ThreadMain() OVERRIDE { + virtual void ThreadMain() override { while (true) { if (closure_.IsSignaled()) return; @@ -98,17 +98,17 @@ class MockCapturerSource : public media::AudioCapturerSource { virtual void Initialize(const media::AudioParameters& params, CaptureCallback* callback, - int session_id) OVERRIDE { + int session_id) override { DCHECK(params.IsValid()); params_ = params; OnInitialize(params, callback, session_id); } - virtual void Start() OVERRIDE { + virtual void Start() override { audio_thread_.reset(new FakeAudioThread(capturer_, params_)); audio_thread_->Start(); OnStart(); } - virtual void Stop() OVERRIDE { + virtual void Stop() override { audio_thread_->Stop(); audio_thread_.reset(); OnStop(); @@ -135,7 +135,7 @@ class MockMediaStreamAudioSink : public PeerConnectionAudioSink { int audio_delay_milliseconds, int current_volume, bool need_audio_processing, - bool key_pressed) OVERRIDE { + bool key_pressed) override { EXPECT_EQ(params_.sample_rate(), sample_rate); EXPECT_EQ(params_.channels(), number_of_channels); EXPECT_EQ(params_.frames_per_buffer(), number_of_frames); @@ -168,7 +168,7 @@ class MockMediaStreamAudioSink : public PeerConnectionAudioSink { class WebRtcLocalAudioTrackTest : public ::testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { params_.Reset(media::AudioParameters::AUDIO_PCM_LOW_LATENCY, media::CHANNEL_LAYOUT_STEREO, 2, 48000, 16, 480); MockMediaConstraintFactory constraint_factory; @@ -191,7 +191,7 @@ class WebRtcLocalAudioTrackTest : public ::testing::Test { capturer_->SetCapturerSourceForTesting(capturer_source_, params_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { blink_source_.reset(); blink::WebHeap::collectAllGarbageForTesting(); } diff --git a/content/renderer/memory_benchmarking_extension.h b/content/renderer/memory_benchmarking_extension.h index 27439e8..ea7cc96 100644 --- a/content/renderer/memory_benchmarking_extension.h +++ b/content/renderer/memory_benchmarking_extension.h @@ -31,7 +31,7 @@ class MemoryBenchmarkingExtension // gin::Wrappable. virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder( - v8::Isolate* isolate) OVERRIDE; + v8::Isolate* isolate) override; bool IsHeapProfilerRunning(); diff --git a/content/renderer/mhtml_generator.h b/content/renderer/mhtml_generator.h index 8f162ea..e308f35 100644 --- a/content/renderer/mhtml_generator.h +++ b/content/renderer/mhtml_generator.h @@ -19,7 +19,7 @@ class MHTMLGenerator : public RenderViewObserver { private: // RenderViewObserver implementation: - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; void OnSavePageAsMHTML(int job_id, IPC::PlatformFileForTransit file_for_transit); diff --git a/content/renderer/mojo/service_registry_js_wrapper.h b/content/renderer/mojo/service_registry_js_wrapper.h index e719e54..e71fca7 100644 --- a/content/renderer/mojo/service_registry_js_wrapper.h +++ b/content/renderer/mojo/service_registry_js_wrapper.h @@ -29,7 +29,7 @@ class CONTENT_EXPORT ServiceRegistryJsWrapper // gin::Wrappable<ServiceRegistryJsWrapper> overrides. virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder( - v8::Isolate* isolate) OVERRIDE; + v8::Isolate* isolate) override; // JS interface implementation. mojo::Handle ConnectToService(const std::string& service_name); diff --git a/content/renderer/notification_permission_dispatcher.h b/content/renderer/notification_permission_dispatcher.h index c68091e..35f24c2 100644 --- a/content/renderer/notification_permission_dispatcher.h +++ b/content/renderer/notification_permission_dispatcher.h @@ -32,7 +32,7 @@ class NotificationPermissionDispatcher : public RenderFrameObserver { private: // RenderFrameObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; void OnPermissionRequestComplete( int request_id, blink::WebNotificationPermission result); diff --git a/content/renderer/notification_provider.h b/content/renderer/notification_provider.h index ab49b07..44b913b 100644 --- a/content/renderer/notification_provider.h +++ b/content/renderer/notification_provider.h @@ -22,7 +22,7 @@ class NotificationProvider : public RenderFrameObserver, private: // RenderFrameObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // blink::WebNotificationPresenter interface. virtual bool show(const blink::WebNotification& proxy); diff --git a/content/renderer/npapi/plugin_channel_host.h b/content/renderer/npapi/plugin_channel_host.h index 6e61346..2ab9ec8 100644 --- a/content/renderer/npapi/plugin_channel_host.h +++ b/content/renderer/npapi/plugin_channel_host.h @@ -27,19 +27,19 @@ class PluginChannelHost : public NPChannelBase { virtual bool Init(base::MessageLoopProxy* ipc_message_loop, bool create_pipe_now, - base::WaitableEvent* shutdown_event) OVERRIDE; + base::WaitableEvent* shutdown_event) override; - virtual int GenerateRouteID() OVERRIDE; + virtual int GenerateRouteID() override; void AddRoute(int route_id, IPC::Listener* listener, NPObjectBase* npobject); void RemoveRoute(int route_id); // NPChannelBase override: - virtual bool Send(IPC::Message* msg) OVERRIDE; + virtual bool Send(IPC::Message* msg) override; // IPC::Listener override - virtual void OnChannelError() OVERRIDE; + virtual void OnChannelError() override; static void Broadcast(IPC::Message* message) { NPChannelBase::Broadcast(message); @@ -54,7 +54,7 @@ class PluginChannelHost : public NPChannelBase { static NPChannelBase* ClassFactory() { return new PluginChannelHost(); } - virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnControlMessageReceived(const IPC::Message& message) override; void OnSetException(const std::string& message); void OnPluginShuttingDown(); diff --git a/content/renderer/npapi/webplugin_delegate_proxy.cc b/content/renderer/npapi/webplugin_delegate_proxy.cc index 0262e39..a8beade 100644 --- a/content/renderer/npapi/webplugin_delegate_proxy.cc +++ b/content/renderer/npapi/webplugin_delegate_proxy.cc @@ -119,7 +119,7 @@ class ResourceClientProxy : public WebPluginResourceClient { } // PluginResourceClient implementation: - virtual void WillSendRequest(const GURL& url, int http_status_code) OVERRIDE { + virtual void WillSendRequest(const GURL& url, int http_status_code) override { DCHECK(channel_.get() != NULL); channel_->Send(new PluginMsg_WillSendRequest( instance_id_, resource_id_, url, http_status_code)); @@ -129,7 +129,7 @@ class ResourceClientProxy : public WebPluginResourceClient { const std::string& headers, uint32 expected_length, uint32 last_modified, - bool request_is_seekable) OVERRIDE { + bool request_is_seekable) override { DCHECK(channel_.get() != NULL); PluginMsg_DidReceiveResponseParams params; params.id = resource_id_; @@ -146,7 +146,7 @@ class ResourceClientProxy : public WebPluginResourceClient { virtual void DidReceiveData(const char* buffer, int length, - int data_offset) OVERRIDE { + int data_offset) override { DCHECK(channel_.get() != NULL); DCHECK_GT(length, 0); std::vector<char> data; @@ -159,7 +159,7 @@ class ResourceClientProxy : public WebPluginResourceClient { data, data_offset)); } - virtual void DidFinishLoading(unsigned long resource_id) OVERRIDE { + virtual void DidFinishLoading(unsigned long resource_id) override { DCHECK(channel_.get() != NULL); DCHECK_EQ(resource_id, resource_id_); channel_->Send(new PluginMsg_DidFinishLoading(instance_id_, resource_id_)); @@ -167,7 +167,7 @@ class ResourceClientProxy : public WebPluginResourceClient { base::MessageLoop::current()->DeleteSoon(FROM_HERE, this); } - virtual void DidFail(unsigned long resource_id) OVERRIDE { + virtual void DidFail(unsigned long resource_id) override { DCHECK(channel_.get() != NULL); DCHECK_EQ(resource_id, resource_id_); channel_->Send(new PluginMsg_DidFail(instance_id_, resource_id_)); @@ -175,11 +175,11 @@ class ResourceClientProxy : public WebPluginResourceClient { base::MessageLoop::current()->DeleteSoon(FROM_HERE, this); } - virtual bool IsMultiByteResponseExpected() OVERRIDE { + virtual bool IsMultiByteResponseExpected() override { return multibyte_response_expected_; } - virtual int ResourceId() OVERRIDE { + virtual int ResourceId() override { return resource_id_; } diff --git a/content/renderer/npapi/webplugin_delegate_proxy.h b/content/renderer/npapi/webplugin_delegate_proxy.h index 6df1ab7..3029bd2 100644 --- a/content/renderer/npapi/webplugin_delegate_proxy.h +++ b/content/renderer/npapi/webplugin_delegate_proxy.h @@ -56,23 +56,23 @@ class WebPluginDelegateProxy RenderFrameImpl* render_frame); // WebPluginDelegate implementation: - virtual void PluginDestroyed() OVERRIDE; + virtual void PluginDestroyed() override; virtual bool Initialize(const GURL& url, const std::vector<std::string>& arg_names, const std::vector<std::string>& arg_values, - bool load_manually) OVERRIDE; + bool load_manually) override; virtual void UpdateGeometry(const gfx::Rect& window_rect, - const gfx::Rect& clip_rect) OVERRIDE; - virtual void Paint(SkCanvas* canvas, const gfx::Rect& rect) OVERRIDE; - virtual NPObject* GetPluginScriptableObject() OVERRIDE; - virtual struct _NPP* GetPluginNPP() OVERRIDE; - virtual bool GetFormValue(base::string16* value) OVERRIDE; + const gfx::Rect& clip_rect) override; + virtual void Paint(SkCanvas* canvas, const gfx::Rect& rect) override; + virtual NPObject* GetPluginScriptableObject() override; + virtual struct _NPP* GetPluginNPP() override; + virtual bool GetFormValue(base::string16* value) override; virtual void DidFinishLoadWithReason(const GURL& url, NPReason reason, - int notify_id) OVERRIDE; - virtual void SetFocus(bool focused) OVERRIDE; + int notify_id) override; + virtual void SetFocus(bool focused) override; virtual bool HandleInputEvent(const blink::WebInputEvent& event, - WebCursor::CursorInfo* cursor) OVERRIDE; - virtual int GetProcessId() OVERRIDE; + WebCursor::CursorInfo* cursor) override; + virtual int GetProcessId() override; // Informs the plugin that its containing content view has gained or lost // first responder status. @@ -104,29 +104,29 @@ class WebPluginDelegateProxy #endif // IPC::Listener implementation: - virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; - virtual void OnChannelError() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& msg) override; + virtual void OnChannelError() override; // IPC::Sender implementation: - virtual bool Send(IPC::Message* msg) OVERRIDE; + virtual bool Send(IPC::Message* msg) override; virtual void SendJavaScriptStream(const GURL& url, const std::string& result, bool success, - int notify_id) OVERRIDE; + int notify_id) override; virtual void DidReceiveManualResponse(const GURL& url, const std::string& mime_type, const std::string& headers, uint32 expected_length, - uint32 last_modified) OVERRIDE; - virtual void DidReceiveManualData(const char* buffer, int length) OVERRIDE; - virtual void DidFinishManualLoading() OVERRIDE; - virtual void DidManualLoadFail() OVERRIDE; + uint32 last_modified) override; + virtual void DidReceiveManualData(const char* buffer, int length) override; + virtual void DidFinishManualLoading() override; + virtual void DidManualLoadFail() override; virtual WebPluginResourceClient* CreateResourceClient( - unsigned long resource_id, const GURL& url, int notify_id) OVERRIDE; + unsigned long resource_id, const GURL& url, int notify_id) override; virtual WebPluginResourceClient* CreateSeekableResourceClient( - unsigned long resource_id, int range_request_id) OVERRIDE; + unsigned long resource_id, int range_request_id) override; virtual void FetchURL(unsigned long resource_id, int notify_id, const GURL& url, @@ -139,7 +139,7 @@ class WebPluginDelegateProxy bool is_plugin_src_load, int origin_pid, int render_frame_id, - int render_view_id) OVERRIDE; + int render_view_id) override; gfx::PluginWindowHandle GetPluginWindowHandle(); diff --git a/content/renderer/npapi/webplugin_impl.h b/content/renderer/npapi/webplugin_impl.h index 6323f6d..f200795 100644 --- a/content/renderer/npapi/webplugin_impl.h +++ b/content/renderer/npapi/webplugin_impl.h @@ -91,24 +91,24 @@ class WebPluginImpl : public WebPlugin, virtual void didFailLoadingFrameRequest( const blink::WebURL& url, void* notify_data, const blink::WebURLError& error); - virtual bool isPlaceholder() OVERRIDE; + virtual bool isPlaceholder() override; // WebPlugin implementation: - virtual void SetWindow(gfx::PluginWindowHandle window) OVERRIDE; - virtual void SetAcceptsInputEvents(bool accepts) OVERRIDE; - virtual void WillDestroyWindow(gfx::PluginWindowHandle window) OVERRIDE; - virtual void CancelResource(unsigned long id) OVERRIDE; - virtual void Invalidate() OVERRIDE; - virtual void InvalidateRect(const gfx::Rect& rect) OVERRIDE; - virtual NPObject* GetWindowScriptNPObject() OVERRIDE; - virtual NPObject* GetPluginElement() OVERRIDE; + virtual void SetWindow(gfx::PluginWindowHandle window) override; + virtual void SetAcceptsInputEvents(bool accepts) override; + virtual void WillDestroyWindow(gfx::PluginWindowHandle window) override; + virtual void CancelResource(unsigned long id) override; + virtual void Invalidate() override; + virtual void InvalidateRect(const gfx::Rect& rect) override; + virtual NPObject* GetWindowScriptNPObject() override; + virtual NPObject* GetPluginElement() override; virtual bool FindProxyForUrl(const GURL& url, - std::string* proxy_list) OVERRIDE; + std::string* proxy_list) override; virtual void SetCookie(const GURL& url, const GURL& first_party_for_cookies, - const std::string& cookie) OVERRIDE; + const std::string& cookie) override; virtual std::string GetCookies(const GURL& url, - const GURL& first_party_for_cookies) OVERRIDE; + const GURL& first_party_for_cookies) override; virtual void HandleURLRequest(const char* url, const char *method, const char* target, @@ -116,18 +116,18 @@ class WebPluginImpl : public WebPlugin, unsigned int len, int notify_id, bool popups_allowed, - bool notify_redirects) OVERRIDE; - virtual void CancelDocumentLoad() OVERRIDE; + bool notify_redirects) override; + virtual void CancelDocumentLoad() override; virtual void InitiateHTTPRangeRequest(const char* url, const char* range_info, - int pending_request_id) OVERRIDE; - virtual void DidStartLoading() OVERRIDE; - virtual void DidStopLoading() OVERRIDE; - virtual bool IsOffTheRecord() OVERRIDE; + int pending_request_id) override; + virtual void DidStartLoading() override; + virtual void DidStopLoading() override; + virtual bool IsOffTheRecord() override; virtual void SetDeferResourceLoading(unsigned long resource_id, - bool defer) OVERRIDE; - virtual void URLRedirectResponse(bool allow, int resource_id) OVERRIDE; - virtual bool CheckIfRunInsecureContent(const GURL& url) OVERRIDE; + bool defer) override; + virtual void URLRedirectResponse(bool allow, int resource_id) override; + virtual bool CheckIfRunInsecureContent(const GURL& url) override; #if defined(OS_WIN) void SetWindowlessData(HANDLE pump_messages_event, gfx::NativeViewId dummy_activation_window) { } @@ -136,12 +136,12 @@ class WebPluginImpl : public WebPlugin, #endif #if defined(OS_MACOSX) virtual WebPluginAcceleratedSurface* GetAcceleratedSurface( - gfx::GpuPreference gpu_preference) OVERRIDE; - virtual void AcceleratedPluginEnabledRendering() OVERRIDE; + gfx::GpuPreference gpu_preference) override; + virtual void AcceleratedPluginEnabledRendering() override; virtual void AcceleratedPluginAllocatedIOSurface(int32 width, int32 height, - uint32 surface_id) OVERRIDE; - virtual void AcceleratedPluginSwappedIOSurface() OVERRIDE; + uint32 surface_id) override; + virtual void AcceleratedPluginSwappedIOSurface() override; #endif private: @@ -330,27 +330,27 @@ class WebPluginImpl : public WebPlugin, virtual void willSendRequest(blink::WebURLLoader*, blink::WebURLRequest&, - const blink::WebURLResponse&) OVERRIDE; + const blink::WebURLResponse&) override; virtual void didSendData(blink::WebURLLoader*, unsigned long long bytesSent, - unsigned long long totalBytesToBeSent) OVERRIDE; + unsigned long long totalBytesToBeSent) override; virtual void didReceiveResponse(blink::WebURLLoader*, - const blink::WebURLResponse&) OVERRIDE; + const blink::WebURLResponse&) override; virtual void didDownloadData(blink::WebURLLoader*, int dataLength, - int encodedDataLength) OVERRIDE; + int encodedDataLength) override; virtual void didReceiveData(blink::WebURLLoader*, const char* data, int dataLength, - int encodedDataLength) OVERRIDE; + int encodedDataLength) override; virtual void didReceiveCachedMetadata(blink::WebURLLoader*, const char* data, - int dataLength) OVERRIDE; + int dataLength) override; virtual void didFinishLoading(blink::WebURLLoader*, double finishTime, - int64_t total_encoded_data_length) OVERRIDE; + int64_t total_encoded_data_length) override; virtual void didFail(blink::WebURLLoader*, - const blink::WebURLError&) OVERRIDE; + const blink::WebURLError&) override; private: WebPluginImpl* parent_; diff --git a/content/renderer/p2p/ipc_network_manager.h b/content/renderer/p2p/ipc_network_manager.h index 58f29cd..ae2e4d2 100644 --- a/content/renderer/p2p/ipc_network_manager.h +++ b/content/renderer/p2p/ipc_network_manager.h @@ -25,12 +25,12 @@ class IpcNetworkManager : public rtc::NetworkManagerBase, CONTENT_EXPORT IpcNetworkManager(NetworkListManager* network_list_manager); virtual ~IpcNetworkManager(); - virtual void StartUpdating() OVERRIDE; - virtual void StopUpdating() OVERRIDE; + virtual void StartUpdating() override; + virtual void StopUpdating() override; // P2PSocketDispatcher::NetworkListObserver interface. virtual void OnNetworkListChanged( - const net::NetworkInterfaceList& list) OVERRIDE; + const net::NetworkInterfaceList& list) override; private: void SendNetworksChangedSignal(); diff --git a/content/renderer/p2p/ipc_network_manager_unittest.cc b/content/renderer/p2p/ipc_network_manager_unittest.cc index d2fbea4..9fdd456 100644 --- a/content/renderer/p2p/ipc_network_manager_unittest.cc +++ b/content/renderer/p2p/ipc_network_manager_unittest.cc @@ -15,10 +15,10 @@ namespace { class MockP2PSocketDispatcher : public NetworkListManager { public: virtual void AddNetworkListObserver( - NetworkListObserver* network_list_observer) OVERRIDE {} + NetworkListObserver* network_list_observer) override {} virtual void RemoveNetworkListObserver( - NetworkListObserver* network_list_observer) OVERRIDE {} + NetworkListObserver* network_list_observer) override {} virtual ~MockP2PSocketDispatcher() {} }; diff --git a/content/renderer/p2p/ipc_socket_factory.cc b/content/renderer/p2p/ipc_socket_factory.cc index 3055016..5611a3d 100644 --- a/content/renderer/p2p/ipc_socket_factory.cc +++ b/content/renderer/p2p/ipc_socket_factory.cc @@ -78,31 +78,31 @@ class IpcPacketSocket : public rtc::AsyncPacketSocket, const rtc::SocketAddress& remote_address); // rtc::AsyncPacketSocket interface. - virtual rtc::SocketAddress GetLocalAddress() const OVERRIDE; - virtual rtc::SocketAddress GetRemoteAddress() const OVERRIDE; + virtual rtc::SocketAddress GetLocalAddress() const override; + virtual rtc::SocketAddress GetRemoteAddress() const override; virtual int Send(const void *pv, size_t cb, - const rtc::PacketOptions& options) OVERRIDE; + const rtc::PacketOptions& options) override; virtual int SendTo(const void *pv, size_t cb, const rtc::SocketAddress& addr, - const rtc::PacketOptions& options) OVERRIDE; - virtual int Close() OVERRIDE; - virtual State GetState() const OVERRIDE; - virtual int GetOption(rtc::Socket::Option option, int* value) OVERRIDE; - virtual int SetOption(rtc::Socket::Option option, int value) OVERRIDE; - virtual int GetError() const OVERRIDE; - virtual void SetError(int error) OVERRIDE; + const rtc::PacketOptions& options) override; + virtual int Close() override; + virtual State GetState() const override; + virtual int GetOption(rtc::Socket::Option option, int* value) override; + virtual int SetOption(rtc::Socket::Option option, int value) override; + virtual int GetError() const override; + virtual void SetError(int error) override; // P2PSocketClientDelegate implementation. virtual void OnOpen(const net::IPEndPoint& local_address, - const net::IPEndPoint& remote_address) OVERRIDE; + const net::IPEndPoint& remote_address) override; virtual void OnIncomingTcpConnection( const net::IPEndPoint& address, - P2PSocketClient* client) OVERRIDE; - virtual void OnSendComplete() OVERRIDE; - virtual void OnError() OVERRIDE; + P2PSocketClient* client) override; + virtual void OnSendComplete() override; + virtual void OnError() override; virtual void OnDataReceived(const net::IPEndPoint& address, const std::vector<char>& data, - const base::TimeTicks& timestamp) OVERRIDE; + const base::TimeTicks& timestamp) override; private: enum InternalState { @@ -175,11 +175,11 @@ class AsyncAddressResolverImpl : public base::NonThreadSafe, virtual ~AsyncAddressResolverImpl(); // rtc::AsyncResolverInterface interface. - virtual void Start(const rtc::SocketAddress& addr) OVERRIDE; + virtual void Start(const rtc::SocketAddress& addr) override; virtual bool GetResolvedAddress( - int family, rtc::SocketAddress* addr) const OVERRIDE; - virtual int GetError() const OVERRIDE; - virtual void Destroy(bool wait) OVERRIDE; + int family, rtc::SocketAddress* addr) const override; + virtual int GetError() const override; + virtual void Destroy(bool wait) override; private: virtual void OnAddressResolved(const net::IPAddressList& addresses); diff --git a/content/renderer/p2p/ipc_socket_factory.h b/content/renderer/p2p/ipc_socket_factory.h index 53e1edc..74db1e6 100644 --- a/content/renderer/p2p/ipc_socket_factory.h +++ b/content/renderer/p2p/ipc_socket_factory.h @@ -28,19 +28,19 @@ class IpcPacketSocketFactory : public rtc::PacketSocketFactory { virtual rtc::AsyncPacketSocket* CreateUdpSocket( const rtc::SocketAddress& local_address, - int min_port, int max_port) OVERRIDE; + int min_port, int max_port) override; virtual rtc::AsyncPacketSocket* CreateServerTcpSocket( const rtc::SocketAddress& local_address, int min_port, int max_port, - int opts) OVERRIDE; + int opts) override; virtual rtc::AsyncPacketSocket* CreateClientTcpSocket( const rtc::SocketAddress& local_address, const rtc::SocketAddress& remote_address, const rtc::ProxyInfo& proxy_info, const std::string& user_agent, - int opts) OVERRIDE; - virtual rtc::AsyncResolverInterface* CreateAsyncResolver() OVERRIDE; + int opts) override; + virtual rtc::AsyncResolverInterface* CreateAsyncResolver() override; private: P2PSocketDispatcher* socket_dispatcher_; diff --git a/content/renderer/p2p/port_allocator.h b/content/renderer/p2p/port_allocator.h index c08b5ae..49563fa 100644 --- a/content/renderer/p2p/port_allocator.h +++ b/content/renderer/p2p/port_allocator.h @@ -48,7 +48,7 @@ class P2PPortAllocator : public cricket::BasicPortAllocator { const std::string& content_name, int component, const std::string& ice_username_fragment, - const std::string& ice_password) OVERRIDE; + const std::string& ice_password) override; private: friend class P2PPortAllocatorSession; @@ -71,7 +71,7 @@ class P2PPortAllocatorSession : public cricket::BasicPortAllocatorSession { protected: // Overrides for cricket::BasicPortAllocatorSession. - virtual void GetPortConfigurations() OVERRIDE; + virtual void GetPortConfigurations() override; private: P2PPortAllocator* allocator_; diff --git a/content/renderer/p2p/socket_client_impl.h b/content/renderer/p2p/socket_client_impl.h index 89e48c0..399d533 100644 --- a/content/renderer/p2p/socket_client_impl.h +++ b/content/renderer/p2p/socket_client_impl.h @@ -41,24 +41,24 @@ class P2PSocketClientImpl : public P2PSocketClient { // Send the |data| to the |address|. virtual void Send(const net::IPEndPoint& address, - const std::vector<char>& data) OVERRIDE; + const std::vector<char>& data) override; // Send the |data| to the |address| using Differentiated Services Code Point // |dscp|. virtual void SendWithDscp(const net::IPEndPoint& address, const std::vector<char>& data, - const rtc::PacketOptions& options) OVERRIDE; + const rtc::PacketOptions& options) override; // Setting socket options. - virtual void SetOption(P2PSocketOption option, int value) OVERRIDE; + virtual void SetOption(P2PSocketOption option, int value) override; // Must be called before the socket is destroyed. The delegate may // not be called after |closed_task| is executed. - virtual void Close() OVERRIDE; + virtual void Close() override; - virtual int GetSocketID() const OVERRIDE; + virtual int GetSocketID() const override; - virtual void SetDelegate(P2PSocketClientDelegate* delegate) OVERRIDE; + virtual void SetDelegate(P2PSocketClientDelegate* delegate) override; private: enum State { diff --git a/content/renderer/p2p/socket_dispatcher.h b/content/renderer/p2p/socket_dispatcher.h index 61a2d3b..24999dc 100644 --- a/content/renderer/p2p/socket_dispatcher.h +++ b/content/renderer/p2p/socket_dispatcher.h @@ -56,9 +56,9 @@ class CONTENT_EXPORT P2PSocketDispatcher : public IPC::MessageFilter, // NetworkListManager interface: virtual void AddNetworkListObserver( - NetworkListObserver* network_list_observer) OVERRIDE; + NetworkListObserver* network_list_observer) override; virtual void RemoveNetworkListObserver( - NetworkListObserver* network_list_observer) OVERRIDE; + NetworkListObserver* network_list_observer) override; protected: virtual ~P2PSocketDispatcher(); @@ -71,10 +71,10 @@ class CONTENT_EXPORT P2PSocketDispatcher : public IPC::MessageFilter, virtual void Send(IPC::Message* message); // IPC::MessageFilter override. Called on IO thread. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE; - virtual void OnFilterRemoved() OVERRIDE; - virtual void OnChannelClosing() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void OnFilterAdded(IPC::Sender* sender) override; + virtual void OnFilterRemoved() override; + virtual void OnChannelClosing() override; // Returns the IO message loop. base::MessageLoopProxy* message_loop(); diff --git a/content/renderer/pepper/content_renderer_pepper_host_factory.h b/content/renderer/pepper/content_renderer_pepper_host_factory.h index 8618b8b..db31320 100644 --- a/content/renderer/pepper/content_renderer_pepper_host_factory.h +++ b/content/renderer/pepper/content_renderer_pepper_host_factory.h @@ -27,7 +27,7 @@ class ContentRendererPepperHostFactory : public ppapi::host::HostFactory { ppapi::host::PpapiHost* host, const ppapi::proxy::ResourceMessageCallParams& params, PP_Instance instance, - const IPC::Message& message) OVERRIDE; + const IPC::Message& message) override; private: const ppapi::PpapiPermissions& GetPermissions() const; diff --git a/content/renderer/pepper/fake_pepper_plugin_instance.h b/content/renderer/pepper/fake_pepper_plugin_instance.h index 99a0cee..280f888 100644 --- a/content/renderer/pepper/fake_pepper_plugin_instance.h +++ b/content/renderer/pepper/fake_pepper_plugin_instance.h @@ -15,34 +15,34 @@ class FakePepperPluginInstance : public PepperPluginInstance { virtual ~FakePepperPluginInstance(); // PepperPluginInstance overrides. - virtual content::RenderView* GetRenderView() OVERRIDE; - virtual blink::WebPluginContainer* GetContainer() OVERRIDE; - virtual v8::Isolate* GetIsolate() const OVERRIDE; - virtual ppapi::VarTracker* GetVarTracker() OVERRIDE; - virtual const GURL& GetPluginURL() OVERRIDE; - virtual base::FilePath GetModulePath() OVERRIDE; + virtual content::RenderView* GetRenderView() override; + virtual blink::WebPluginContainer* GetContainer() override; + virtual v8::Isolate* GetIsolate() const override; + virtual ppapi::VarTracker* GetVarTracker() override; + virtual const GURL& GetPluginURL() override; + virtual base::FilePath GetModulePath() override; virtual PP_Resource CreateImage(gfx::ImageSkia* source_image, - float scale) OVERRIDE; + float scale) override; virtual PP_ExternalPluginResult SwitchToOutOfProcessProxy( const base::FilePath& file_path, ppapi::PpapiPermissions permissions, const IPC::ChannelHandle& channel_handle, base::ProcessId plugin_pid, - int plugin_child_id) OVERRIDE; - virtual void SetAlwaysOnTop(bool on_top) OVERRIDE; - virtual bool IsFullPagePlugin() OVERRIDE; - virtual bool FlashSetFullscreen(bool fullscreen, bool delay_report) OVERRIDE; - virtual bool IsRectTopmost(const gfx::Rect& rect) OVERRIDE; + int plugin_child_id) override; + virtual void SetAlwaysOnTop(bool on_top) override; + virtual bool IsFullPagePlugin() override; + virtual bool FlashSetFullscreen(bool fullscreen, bool delay_report) override; + virtual bool IsRectTopmost(const gfx::Rect& rect) override; virtual int32_t Navigate(const ppapi::URLRequestInfoData& request, const char* target, - bool from_user_action) OVERRIDE; + bool from_user_action) override; virtual int MakePendingFileRefRendererHost(const base::FilePath& path) - OVERRIDE; - virtual void SetEmbedProperty(PP_Var key, PP_Var value) OVERRIDE; - virtual void SetSelectedText(const base::string16& selected_text) OVERRIDE; - virtual void SetLinkUnderCursor(const std::string& url) OVERRIDE; - virtual void SetTextInputType(ui::TextInputType type) OVERRIDE; - virtual void PostMessageToJavaScript(PP_Var message) OVERRIDE; + override; + virtual void SetEmbedProperty(PP_Var key, PP_Var value) override; + virtual void SetSelectedText(const base::string16& selected_text) override; + virtual void SetLinkUnderCursor(const std::string& url) override; + virtual void SetTextInputType(ui::TextInputType type) override; + virtual void PostMessageToJavaScript(PP_Var message) override; private: GURL gurl_; diff --git a/content/renderer/pepper/host_array_buffer_var.h b/content/renderer/pepper/host_array_buffer_var.h index 12ae729..3e5b5b4 100644 --- a/content/renderer/pepper/host_array_buffer_var.h +++ b/content/renderer/pepper/host_array_buffer_var.h @@ -22,13 +22,13 @@ class HostArrayBufferVar : public ppapi::ArrayBufferVar { base::SharedMemoryHandle handle); // ArrayBufferVar implementation. - virtual void* Map() OVERRIDE; - virtual void Unmap() OVERRIDE; - virtual uint32 ByteLength() OVERRIDE; + virtual void* Map() override; + virtual void Unmap() override; + virtual uint32 ByteLength() override; virtual bool CopyToNewShmem(PP_Instance instance, int* host_shm_handle_id, base::SharedMemoryHandle* plugin_shm_handle) - OVERRIDE; + override; blink::WebArrayBuffer& webkit_buffer() { return buffer_; } diff --git a/content/renderer/pepper/host_globals.h b/content/renderer/pepper/host_globals.h index f91a65c..5320234 100644 --- a/content/renderer/pepper/host_globals.h +++ b/content/renderer/pepper/host_globals.h @@ -31,27 +31,27 @@ class HostGlobals : public ppapi::PpapiGlobals { } // PpapiGlobals implementation. - virtual ppapi::ResourceTracker* GetResourceTracker() OVERRIDE; - virtual ppapi::VarTracker* GetVarTracker() OVERRIDE; + virtual ppapi::ResourceTracker* GetResourceTracker() override; + virtual ppapi::VarTracker* GetVarTracker() override; virtual ppapi::CallbackTracker* GetCallbackTrackerForInstance( - PP_Instance instance) OVERRIDE; + PP_Instance instance) override; virtual ppapi::thunk::PPB_Instance_API* GetInstanceAPI(PP_Instance instance) - OVERRIDE; + override; virtual ppapi::thunk::ResourceCreationAPI* GetResourceCreationAPI( - PP_Instance instance) OVERRIDE; - virtual PP_Module GetModuleForInstance(PP_Instance instance) OVERRIDE; - virtual std::string GetCmdLine() OVERRIDE; - virtual void PreCacheFontForFlash(const void* logfontw) OVERRIDE; + PP_Instance instance) override; + virtual PP_Module GetModuleForInstance(PP_Instance instance) override; + virtual std::string GetCmdLine() override; + virtual void PreCacheFontForFlash(const void* logfontw) override; virtual void LogWithSource(PP_Instance instance, PP_LogLevel level, const std::string& source, - const std::string& value) OVERRIDE; + const std::string& value) override; virtual void BroadcastLogWithSource(PP_Module module, PP_LogLevel level, const std::string& source, - const std::string& value) OVERRIDE; - virtual ppapi::MessageLoopShared* GetCurrentMessageLoop() OVERRIDE; - virtual base::TaskRunner* GetFileTaskRunner() OVERRIDE; + const std::string& value) override; + virtual ppapi::MessageLoopShared* GetCurrentMessageLoop() override; + virtual base::TaskRunner* GetFileTaskRunner() override; HostVarTracker* host_var_tracker() { return &host_var_tracker_; } @@ -88,7 +88,7 @@ class HostGlobals : public ppapi::PpapiGlobals { private: // PpapiGlobals overrides. - virtual bool IsHostGlobals() const OVERRIDE; + virtual bool IsHostGlobals() const override; static HostGlobals* host_globals_; diff --git a/content/renderer/pepper/host_resource_var.h b/content/renderer/pepper/host_resource_var.h index 1e8928a..6a37020 100644 --- a/content/renderer/pepper/host_resource_var.h +++ b/content/renderer/pepper/host_resource_var.h @@ -32,11 +32,11 @@ class HostResourceVar : public ppapi::ResourceVar { const IPC::Message& creation_message); // ResourceVar override. - virtual PP_Resource GetPPResource() const OVERRIDE; - virtual int GetPendingRendererHostId() const OVERRIDE; - virtual int GetPendingBrowserHostId() const OVERRIDE; - virtual const IPC::Message* GetCreationMessage() const OVERRIDE; - virtual bool IsPending() const OVERRIDE; + virtual PP_Resource GetPPResource() const override; + virtual int GetPendingRendererHostId() const override; + virtual int GetPendingBrowserHostId() const override; + virtual const IPC::Message* GetCreationMessage() const override; + virtual bool IsPending() const override; void set_pending_browser_host_id(int id) { pending_browser_host_id_ = id; } diff --git a/content/renderer/pepper/host_var_tracker.h b/content/renderer/pepper/host_var_tracker.h index a5518c8..56f4710 100644 --- a/content/renderer/pepper/host_var_tracker.h +++ b/content/renderer/pepper/host_var_tracker.h @@ -50,25 +50,25 @@ class HostVarTracker : public ppapi::VarTracker { PP_Instance instance, const IPC::Message& creation_message, int pending_renderer_id, - int pending_browser_id) OVERRIDE; - virtual ppapi::ResourceVar* MakeResourceVar(PP_Resource pp_resource) OVERRIDE; - virtual void DidDeleteInstance(PP_Instance pp_instance) OVERRIDE; + int pending_browser_id) override; + virtual ppapi::ResourceVar* MakeResourceVar(PP_Resource pp_resource) override; + virtual void DidDeleteInstance(PP_Instance pp_instance) override; virtual int TrackSharedMemoryHandle(PP_Instance instance, base::SharedMemoryHandle file, - uint32 size_in_bytes) OVERRIDE; + uint32 size_in_bytes) override; virtual bool StopTrackingSharedMemoryHandle(int id, PP_Instance instance, base::SharedMemoryHandle* handle, - uint32* size_in_bytes) OVERRIDE; + uint32* size_in_bytes) override; private: // VarTracker private implementation. virtual ppapi::ArrayBufferVar* CreateArrayBuffer(uint32 size_in_bytes) - OVERRIDE; + override; virtual ppapi::ArrayBufferVar* CreateShmArrayBuffer( uint32 size_in_bytes, - base::SharedMemoryHandle handle) OVERRIDE; + base::SharedMemoryHandle handle) override; // Clear the reference count of the given object and remove it from // live_vars_. diff --git a/content/renderer/pepper/host_var_tracker_unittest.cc b/content/renderer/pepper/host_var_tracker_unittest.cc index c33fe23..5b4175b 100644 --- a/content/renderer/pepper/host_var_tracker_unittest.cc +++ b/content/renderer/pepper/host_var_tracker_unittest.cc @@ -49,9 +49,9 @@ class PepperTryCatchForTest : public PepperTryCatch { handle_scope_(instance->GetIsolate()), context_scope_(v8::Context::New(instance->GetIsolate())) {} - virtual void SetException(const char* message) OVERRIDE { NOTREACHED(); } - virtual bool HasException() OVERRIDE { return false; } - virtual v8::Handle<v8::Context> GetContext() OVERRIDE { + virtual void SetException(const char* message) override { NOTREACHED(); } + virtual bool HasException() override { return false; } + virtual v8::Handle<v8::Context> GetContext() override { return instance_->GetIsolate()->GetCurrentContext(); } @@ -68,7 +68,7 @@ class HostVarTrackerTest : public PpapiUnittest { public: HostVarTrackerTest() {} - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { v8::Isolate::GetCurrent()->RequestGarbageCollectionForTesting( v8::Isolate::kFullGarbageCollection); EXPECT_EQ(0, g_v8objects_alive); diff --git a/content/renderer/pepper/message_channel.h b/content/renderer/pepper/message_channel.h index 9bd75df..4598bb1 100644 --- a/content/renderer/pepper/message_channel.h +++ b/content/renderer/pepper/message_channel.h @@ -94,20 +94,20 @@ class MessageChannel : // gin::NamedPropertyInterceptor virtual v8::Local<v8::Value> GetNamedProperty( v8::Isolate* isolate, - const std::string& property) OVERRIDE; + const std::string& property) override; virtual bool SetNamedProperty(v8::Isolate* isolate, const std::string& property, - v8::Local<v8::Value> value) OVERRIDE; + v8::Local<v8::Value> value) override; virtual std::vector<std::string> EnumerateNamedProperties( - v8::Isolate* isolate) OVERRIDE; + v8::Isolate* isolate) override; // gin::Wrappable virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder( - v8::Isolate* isolate) OVERRIDE; + v8::Isolate* isolate) override; // ppapi::proxy::HostDispatcher::SyncMessageStatusObserver - virtual void BeginBlockOnSyncMessage() OVERRIDE; - virtual void EndBlockOnSyncMessage() OVERRIDE; + virtual void BeginBlockOnSyncMessage() override; + virtual void EndBlockOnSyncMessage() override; // Post a message to the plugin's HandleMessage function for this channel's // instance. diff --git a/content/renderer/pepper/mock_renderer_ppapi_host.h b/content/renderer/pepper/mock_renderer_ppapi_host.h index 62c9d65..42fe4d4 100644 --- a/content/renderer/pepper/mock_renderer_ppapi_host.h +++ b/content/renderer/pepper/mock_renderer_ppapi_host.h @@ -32,34 +32,34 @@ class MockRendererPpapiHost : public RendererPpapiHost { void set_has_user_gesture(bool gesture) { has_user_gesture_ = gesture; } // RendererPpapiHost. - virtual ppapi::host::PpapiHost* GetPpapiHost() OVERRIDE; - virtual bool IsValidInstance(PP_Instance instance) const OVERRIDE; + virtual ppapi::host::PpapiHost* GetPpapiHost() override; + virtual bool IsValidInstance(PP_Instance instance) const override; virtual PepperPluginInstance* GetPluginInstance(PP_Instance instance) const - OVERRIDE; + override; virtual RenderFrame* GetRenderFrameForInstance(PP_Instance instance) const - OVERRIDE; + override; virtual RenderView* GetRenderViewForInstance(PP_Instance instance) const - OVERRIDE; + override; virtual blink::WebPluginContainer* GetContainerForInstance( - PP_Instance instance) const OVERRIDE; - virtual base::ProcessId GetPluginPID() const OVERRIDE; - virtual bool HasUserGesture(PP_Instance instance) const OVERRIDE; - virtual int GetRoutingIDForWidget(PP_Instance instance) const OVERRIDE; + PP_Instance instance) const override; + virtual base::ProcessId GetPluginPID() const override; + virtual bool HasUserGesture(PP_Instance instance) const override; + virtual int GetRoutingIDForWidget(PP_Instance instance) const override; virtual gfx::Point PluginPointToRenderFrame(PP_Instance instance, const gfx::Point& pt) const - OVERRIDE; + override; virtual IPC::PlatformFileForTransit ShareHandleWithRemote( base::PlatformFile handle, - bool should_close_source) OVERRIDE; - virtual bool IsRunningInProcess() const OVERRIDE; - virtual std::string GetPluginName() const OVERRIDE; - virtual void SetToExternalPluginHost() OVERRIDE; + bool should_close_source) override; + virtual bool IsRunningInProcess() const override; + virtual std::string GetPluginName() const override; + virtual void SetToExternalPluginHost() override; virtual void CreateBrowserResourceHosts( PP_Instance instance, const std::vector<IPC::Message>& nested_msgs, const base::Callback<void(const std::vector<int>&)>& callback) const - OVERRIDE; - virtual GURL GetDocumentURL(PP_Instance instance) const OVERRIDE; + override; + virtual GURL GetDocumentURL(PP_Instance instance) const override; private: ppapi::proxy::ResourceMessageTestSink sink_; diff --git a/content/renderer/pepper/pepper_audio_input_host.h b/content/renderer/pepper/pepper_audio_input_host.h index 40f98b0..4e8b450 100644 --- a/content/renderer/pepper/pepper_audio_input_host.h +++ b/content/renderer/pepper/pepper_audio_input_host.h @@ -31,7 +31,7 @@ class PepperAudioInputHost : public ppapi::host::ResourceHost { virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; // Called when the stream is created. void StreamCreated(base::SharedMemoryHandle shared_memory_handle, diff --git a/content/renderer/pepper/pepper_browser_connection.h b/content/renderer/pepper/pepper_browser_connection.h index c79a6ec..d81a90c 100644 --- a/content/renderer/pepper/pepper_browser_connection.h +++ b/content/renderer/pepper/pepper_browser_connection.h @@ -34,7 +34,7 @@ class PepperBrowserConnection explicit PepperBrowserConnection(RenderFrame* render_frame); virtual ~PepperBrowserConnection(); - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // TODO(teravest): Instead of having separate methods per message, we should // add generic functionality similar to PluginResource::Call(). diff --git a/content/renderer/pepper/pepper_compositor_host.h b/content/renderer/pepper/pepper_compositor_host.h index de2f72b..f6cf87f 100644 --- a/content/renderer/pepper/pepper_compositor_host.h +++ b/content/renderer/pepper/pepper_compositor_host.h @@ -60,10 +60,10 @@ class PepperCompositorHost : public ppapi::host::ResourceHost { // ResourceMessageHandler overrides: virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; // ppapi::host::ResourceHost overrides: - virtual bool IsCompositorHost() OVERRIDE; + virtual bool IsCompositorHost() override; // Message handlers: int32_t OnHostMsgCommitLayers( diff --git a/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc b/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc index a9b2579..69c7a318 100644 --- a/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc +++ b/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc @@ -33,13 +33,13 @@ class TestDelegate : public PepperDeviceEnumerationHostHelper::Delegate { virtual int EnumerateDevices(PP_DeviceType_Dev /* type */, const GURL& /* document_url */, const EnumerateDevicesCallback& callback) - OVERRIDE { + override { last_used_id_++; callbacks_[last_used_id_] = callback; return last_used_id_; } - virtual void StopEnumerateDevices(int request_id) OVERRIDE { + virtual void StopEnumerateDevices(int request_id) override { std::map<int, EnumerateDevicesCallback>::iterator iter = callbacks_.find(request_id); CHECK(iter != callbacks_.end()); diff --git a/content/renderer/pepper/pepper_file_chooser_host.h b/content/renderer/pepper/pepper_file_chooser_host.h index 52f7c5f..50ca0de 100644 --- a/content/renderer/pepper/pepper_file_chooser_host.h +++ b/content/renderer/pepper/pepper_file_chooser_host.h @@ -42,7 +42,7 @@ class CONTENT_EXPORT PepperFileChooserHost virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; void StoreChosenFiles(const std::vector<ChosenFileInfo>& files); diff --git a/content/renderer/pepper/pepper_file_ref_renderer_host.h b/content/renderer/pepper/pepper_file_ref_renderer_host.h index 9cfc65f..3e91485 100644 --- a/content/renderer/pepper/pepper_file_ref_renderer_host.h +++ b/content/renderer/pepper/pepper_file_ref_renderer_host.h @@ -44,8 +44,8 @@ class PepperFileRefRendererHost : public ppapi::host::ResourceHost { // ppapi::host::ResourceHost override. virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; - virtual bool IsFileRefHost() OVERRIDE; + ppapi::host::HostMessageContext* context) override; + virtual bool IsFileRefHost() override; private: PP_FileSystemType file_system_type_; diff --git a/content/renderer/pepper/pepper_file_system_host.h b/content/renderer/pepper/pepper_file_system_host.h index e1657a1..79fcf31 100644 --- a/content/renderer/pepper/pepper_file_system_host.h +++ b/content/renderer/pepper/pepper_file_system_host.h @@ -44,8 +44,8 @@ class PepperFileSystemHost // ppapi::host::ResourceHost override. virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; - virtual bool IsFileSystemHost() OVERRIDE; + ppapi::host::HostMessageContext* context) override; + virtual bool IsFileSystemHost() override; // Supports FileRefs direct access on the host side. PP_FileSystemType GetType() const { return type_; } diff --git a/content/renderer/pepper/pepper_graphics_2d_host.h b/content/renderer/pepper/pepper_graphics_2d_host.h index f5e5d47..d5753ccd 100644 --- a/content/renderer/pepper/pepper_graphics_2d_host.h +++ b/content/renderer/pepper/pepper_graphics_2d_host.h @@ -56,8 +56,8 @@ class CONTENT_EXPORT PepperGraphics2DHost // ppapi::host::ResourceHost override. virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; - virtual bool IsGraphics2DHost() OVERRIDE; + ppapi::host::HostMessageContext* context) override; + virtual bool IsGraphics2DHost() override; bool ReadImageData(PP_Resource image, const PP_Point* top_left); // Assciates this device with the given plugin instance. You can pass NULL diff --git a/content/renderer/pepper/pepper_hung_plugin_filter.h b/content/renderer/pepper/pepper_hung_plugin_filter.h index bc5d386..08d4dc2 100644 --- a/content/renderer/pepper/pepper_hung_plugin_filter.h +++ b/content/renderer/pepper/pepper_hung_plugin_filter.h @@ -40,14 +40,14 @@ class PepperHungPluginFilter int plugin_child_id); // SyncMessageStatusReceiver implementation. - virtual void BeginBlockOnSyncMessage() OVERRIDE; - virtual void EndBlockOnSyncMessage() OVERRIDE; + virtual void BeginBlockOnSyncMessage() override; + virtual void EndBlockOnSyncMessage() override; // MessageFilter implementation. - virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE; - virtual void OnFilterRemoved() OVERRIDE; - virtual void OnChannelError() OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual void OnFilterAdded(IPC::Sender* sender) override; + virtual void OnFilterRemoved() override; + virtual void OnChannelError() override; + virtual bool OnMessageReceived(const IPC::Message& message) override; protected: virtual ~PepperHungPluginFilter(); diff --git a/content/renderer/pepper/pepper_in_process_resource_creation.h b/content/renderer/pepper/pepper_in_process_resource_creation.h index 2718912..0401ae5 100644 --- a/content/renderer/pepper/pepper_in_process_resource_creation.h +++ b/content/renderer/pepper/pepper_in_process_resource_creation.h @@ -43,26 +43,26 @@ class PepperInProcessResourceCreation : public ResourceCreationImpl { // ResourceCreation_API implementation. virtual PP_Resource CreateBrowserFont( PP_Instance instance, - const PP_BrowserFont_Trusted_Description* description) OVERRIDE; + const PP_BrowserFont_Trusted_Description* description) override; virtual PP_Resource CreateFileChooser(PP_Instance instance, PP_FileChooserMode_Dev mode, - const PP_Var& accept_types) OVERRIDE; - virtual PP_Resource CreateFileIO(PP_Instance instance) OVERRIDE; + const PP_Var& accept_types) override; + virtual PP_Resource CreateFileIO(PP_Instance instance) override; virtual PP_Resource CreateFileRef(PP_Instance instance, const ppapi::FileRefCreateInfo& create_info) - OVERRIDE; + override; virtual PP_Resource CreateFileSystem(PP_Instance instance, - PP_FileSystemType type) OVERRIDE; + PP_FileSystemType type) override; virtual PP_Resource CreateGraphics2D(PP_Instance pp_instance, const PP_Size* size, - PP_Bool is_always_opaque) OVERRIDE; - virtual PP_Resource CreatePrinting(PP_Instance instance) OVERRIDE; + PP_Bool is_always_opaque) override; + virtual PP_Resource CreatePrinting(PP_Instance instance) override; virtual PP_Resource CreateTrueTypeFont( PP_Instance instance, - const struct PP_TrueTypeFontDesc_Dev* desc) OVERRIDE; - virtual PP_Resource CreateURLLoader(PP_Instance instance) OVERRIDE; - virtual PP_Resource CreateURLRequestInfo(PP_Instance instance) OVERRIDE; - virtual PP_Resource CreateWebSocket(PP_Instance instance) OVERRIDE; + const struct PP_TrueTypeFontDesc_Dev* desc) override; + virtual PP_Resource CreateURLLoader(PP_Instance instance) override; + virtual PP_Resource CreateURLRequestInfo(PP_Instance instance) override; + virtual PP_Resource CreateWebSocket(PP_Instance instance) override; private: // Non-owning pointer to the host for the current plugin. diff --git a/content/renderer/pepper/pepper_in_process_router.cc b/content/renderer/pepper/pepper_in_process_router.cc index 9194f12..5b0d36f 100644 --- a/content/renderer/pepper/pepper_in_process_router.cc +++ b/content/renderer/pepper/pepper_in_process_router.cc @@ -26,7 +26,7 @@ class PepperInProcessRouter::Channel : public IPC::Sender { virtual ~Channel() {} - virtual bool Send(IPC::Message* message) OVERRIDE { + virtual bool Send(IPC::Message* message) override { return callback_.Run(message); } diff --git a/content/renderer/pepper/pepper_media_device_manager.h b/content/renderer/pepper/pepper_media_device_manager.h index b3d94e0..ef2df60d 100644 --- a/content/renderer/pepper/pepper_media_device_manager.h +++ b/content/renderer/pepper/pepper_media_device_manager.h @@ -30,8 +30,8 @@ class PepperMediaDeviceManager virtual int EnumerateDevices(PP_DeviceType_Dev type, const GURL& document_url, const EnumerateDevicesCallback& callback) - OVERRIDE; - virtual void StopEnumerateDevices(int request_id) OVERRIDE; + override; + virtual void StopEnumerateDevices(int request_id) override; typedef base::Callback<void(int /* request_id */, bool /* succeeded */, @@ -59,19 +59,19 @@ class PepperMediaDeviceManager int request_id, const std::string& label, const StreamDeviceInfoArray& audio_device_array, - const StreamDeviceInfoArray& video_device_array) OVERRIDE; + const StreamDeviceInfoArray& video_device_array) override; virtual void OnStreamGenerationFailed( int request_id, - content::MediaStreamRequestResult result) OVERRIDE; + content::MediaStreamRequestResult result) override; virtual void OnDeviceStopped(const std::string& label, - const StreamDeviceInfo& device_info) OVERRIDE; + const StreamDeviceInfo& device_info) override; virtual void OnDevicesEnumerated(int request_id, const StreamDeviceInfoArray& device_array) - OVERRIDE; + override; virtual void OnDeviceOpened(int request_id, const std::string& label, - const StreamDeviceInfo& device_info) OVERRIDE; - virtual void OnDeviceOpenFailed(int request_id) OVERRIDE; + const StreamDeviceInfo& device_info) override; + virtual void OnDeviceOpenFailed(int request_id) override; // Stream type conversion. static MediaStreamType FromPepperDeviceType(PP_DeviceType_Dev type); diff --git a/content/renderer/pepper/pepper_media_stream_audio_track_host.h b/content/renderer/pepper/pepper_media_stream_audio_track_host.h index 0d3d33f..2940c7b 100644 --- a/content/renderer/pepper/pepper_media_stream_audio_track_host.h +++ b/content/renderer/pepper/pepper_media_stream_audio_track_host.h @@ -67,8 +67,8 @@ class PepperMediaStreamAudioTrackHost : public PepperMediaStreamTrackHostBase { virtual void OnData(const int16* audio_data, int sample_rate, int number_of_channels, - int number_of_frames) OVERRIDE; - virtual void OnSetFormat(const media::AudioParameters& params) OVERRIDE; + int number_of_frames) override; + virtual void OnSetFormat(const media::AudioParameters& params) override; // Unowned host which is available during the AudioSink's lifespan. // It is mainly used in the main thread. But the audio thread will use @@ -153,7 +153,7 @@ class PepperMediaStreamAudioTrackHost : public PepperMediaStreamTrackHostBase { // ResourceMessageHandler overrides: virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; // Message handlers: int32_t OnHostMsgConfigure( @@ -161,13 +161,13 @@ class PepperMediaStreamAudioTrackHost : public PepperMediaStreamTrackHostBase { const ppapi::MediaStreamAudioTrackShared::Attributes& attributes); // PepperMediaStreamTrackHostBase overrides: - virtual void OnClose() OVERRIDE; + virtual void OnClose() override; // MediaStreamBufferManager::Delegate overrides: - virtual void OnNewBufferEnqueued() OVERRIDE; + virtual void OnNewBufferEnqueued() override; // ResourceHost overrides: - virtual void DidConnectPendingHostToResource() OVERRIDE; + virtual void DidConnectPendingHostToResource() override; blink::WebMediaStreamTrack track_; diff --git a/content/renderer/pepper/pepper_media_stream_track_host_base.h b/content/renderer/pepper/pepper_media_stream_track_host_base.h index 37ebd61..9bd6d09 100644 --- a/content/renderer/pepper/pepper_media_stream_track_host_base.h +++ b/content/renderer/pepper/pepper_media_stream_track_host_base.h @@ -48,7 +48,7 @@ class PepperMediaStreamTrackHostBase // ResourceMessageHandler overrides: virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; // Message handlers: virtual int32_t OnHostMsgEnqueueBuffer( diff --git a/content/renderer/pepper/pepper_media_stream_video_track_host.h b/content/renderer/pepper/pepper_media_stream_video_track_host.h index d05313d..b252ff9 100644 --- a/content/renderer/pepper/pepper_media_stream_video_track_host.h +++ b/content/renderer/pepper/pepper_media_stream_video_track_host.h @@ -37,7 +37,7 @@ class PepperMediaStreamVideoTrackHost : public PepperMediaStreamTrackHostBase, PP_Instance instance, PP_Resource resource); - virtual bool IsMediaStreamVideoTrackHost() OVERRIDE; + virtual bool IsMediaStreamVideoTrackHost() override; blink::WebMediaStreamTrack track() { return track_; } @@ -48,9 +48,9 @@ class PepperMediaStreamVideoTrackHost : public PepperMediaStreamTrackHostBase, void InitBuffers(); // PepperMediaStreamTrackHostBase overrides: - virtual void OnClose() OVERRIDE; + virtual void OnClose() override; virtual int32_t OnHostMsgEnqueueBuffer( - ppapi::host::HostMessageContext* context, int32_t index) OVERRIDE; + ppapi::host::HostMessageContext* context, int32_t index) override; // Sends frame with |index| to |track_|. int32_t SendFrameToTrack(int32_t index); @@ -64,21 +64,21 @@ class PepperMediaStreamVideoTrackHost : public PepperMediaStreamTrackHostBase, int max_requested_width, int max_requested_height, double max_requested_frame_rate, - const VideoCaptureDeviceFormatsCB& callback) OVERRIDE; + const VideoCaptureDeviceFormatsCB& callback) override; virtual void StartSourceImpl( const media::VideoCaptureFormat& format, - const VideoCaptureDeliverFrameCB& frame_callback) OVERRIDE; + const VideoCaptureDeliverFrameCB& frame_callback) override; - virtual void StopSourceImpl() OVERRIDE; + virtual void StopSourceImpl() override; // ResourceHost overrides: - virtual void DidConnectPendingHostToResource() OVERRIDE; + virtual void DidConnectPendingHostToResource() override; // ResourceMessageHandler overrides: virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; // Message handlers: int32_t OnHostMsgConfigure( diff --git a/content/renderer/pepper/pepper_platform_audio_input.h b/content/renderer/pepper/pepper_platform_audio_input.h index e443577..c1848b8 100644 --- a/content/renderer/pepper/pepper_platform_audio_input.h +++ b/content/renderer/pepper/pepper_platform_audio_input.h @@ -61,11 +61,11 @@ class PepperPlatformAudioInput virtual void OnStreamCreated(base::SharedMemoryHandle handle, base::SyncSocket::Handle socket_handle, int length, - int total_segments) OVERRIDE; - virtual void OnVolume(double volume) OVERRIDE; + int total_segments) override; + virtual void OnVolume(double volume) override; virtual void OnStateChanged(media::AudioInputIPCDelegate::State state) - OVERRIDE; - virtual void OnIPCClosed() OVERRIDE; + override; + virtual void OnIPCClosed() override; protected: virtual ~PepperPlatformAudioInput(); diff --git a/content/renderer/pepper/pepper_platform_audio_output.h b/content/renderer/pepper/pepper_platform_audio_output.h index 725d42f..2bb8ce6 100644 --- a/content/renderer/pepper/pepper_platform_audio_output.h +++ b/content/renderer/pepper/pepper_platform_audio_output.h @@ -49,11 +49,11 @@ class PepperPlatformAudioOutput // media::AudioOutputIPCDelegate implementation. virtual void OnStateChanged(media::AudioOutputIPCDelegate::State state) - OVERRIDE; + override; virtual void OnStreamCreated(base::SharedMemoryHandle handle, base::SyncSocket::Handle socket_handle, - int length) OVERRIDE; - virtual void OnIPCClosed() OVERRIDE; + int length) override; + virtual void OnIPCClosed() override; protected: virtual ~PepperPlatformAudioOutput(); diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc index 90032fe..cc4ae71 100644 --- a/content/renderer/pepper/pepper_plugin_instance_impl.cc +++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc @@ -356,14 +356,14 @@ class PluginInstanceLockTarget : public MouseLockDispatcher::LockTarget { PluginInstanceLockTarget(PepperPluginInstanceImpl* plugin) : plugin_(plugin) {} - virtual void OnLockMouseACK(bool succeeded) OVERRIDE { + virtual void OnLockMouseACK(bool succeeded) override { plugin_->OnLockMouseACK(succeeded); } - virtual void OnMouseLockLost() OVERRIDE { plugin_->OnMouseLockLost(); } + virtual void OnMouseLockLost() override { plugin_->OnMouseLockLost(); } virtual bool HandleMouseLockedInputEvent(const blink::WebMouseEvent& event) - OVERRIDE { + override { plugin_->HandleMouseLockedInputEvent(event); return true; } diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.h b/content/renderer/pepper/pepper_plugin_instance_impl.h index f0780ab..81aa6b9 100644 --- a/content/renderer/pepper/pepper_plugin_instance_impl.h +++ b/content/renderer/pepper/pepper_plugin_instance_impl.h @@ -357,177 +357,177 @@ class CONTENT_EXPORT PepperPluginInstanceImpl ContentDecryptorDelegate* GetContentDecryptorDelegate(); // PluginInstance implementation - virtual RenderView* GetRenderView() OVERRIDE; - virtual blink::WebPluginContainer* GetContainer() OVERRIDE; - virtual v8::Isolate* GetIsolate() const OVERRIDE; - virtual ppapi::VarTracker* GetVarTracker() OVERRIDE; - virtual const GURL& GetPluginURL() OVERRIDE; - virtual base::FilePath GetModulePath() OVERRIDE; + virtual RenderView* GetRenderView() override; + virtual blink::WebPluginContainer* GetContainer() override; + virtual v8::Isolate* GetIsolate() const override; + virtual ppapi::VarTracker* GetVarTracker() override; + virtual const GURL& GetPluginURL() override; + virtual base::FilePath GetModulePath() override; virtual PP_Resource CreateImage(gfx::ImageSkia* source_image, - float scale) OVERRIDE; + float scale) override; virtual PP_ExternalPluginResult SwitchToOutOfProcessProxy( const base::FilePath& file_path, ppapi::PpapiPermissions permissions, const IPC::ChannelHandle& channel_handle, base::ProcessId plugin_pid, - int plugin_child_id) OVERRIDE; - virtual void SetAlwaysOnTop(bool on_top) OVERRIDE; - virtual bool IsFullPagePlugin() OVERRIDE; - virtual bool FlashSetFullscreen(bool fullscreen, bool delay_report) OVERRIDE; - virtual bool IsRectTopmost(const gfx::Rect& rect) OVERRIDE; + int plugin_child_id) override; + virtual void SetAlwaysOnTop(bool on_top) override; + virtual bool IsFullPagePlugin() override; + virtual bool FlashSetFullscreen(bool fullscreen, bool delay_report) override; + virtual bool IsRectTopmost(const gfx::Rect& rect) override; virtual int32_t Navigate(const ppapi::URLRequestInfoData& request, const char* target, - bool from_user_action) OVERRIDE; + bool from_user_action) override; virtual int MakePendingFileRefRendererHost(const base::FilePath& path) - OVERRIDE; - virtual void SetEmbedProperty(PP_Var key, PP_Var value) OVERRIDE; - virtual void SetSelectedText(const base::string16& selected_text) OVERRIDE; - virtual void SetLinkUnderCursor(const std::string& url) OVERRIDE; - virtual void SetTextInputType(ui::TextInputType type) OVERRIDE; - virtual void PostMessageToJavaScript(PP_Var message) OVERRIDE; + override; + virtual void SetEmbedProperty(PP_Var key, PP_Var value) override; + virtual void SetSelectedText(const base::string16& selected_text) override; + virtual void SetLinkUnderCursor(const std::string& url) override; + virtual void SetTextInputType(ui::TextInputType type) override; + virtual void PostMessageToJavaScript(PP_Var message) override; // PPB_Instance_API implementation. virtual PP_Bool BindGraphics(PP_Instance instance, - PP_Resource device) OVERRIDE; - virtual PP_Bool IsFullFrame(PP_Instance instance) OVERRIDE; - virtual const ppapi::ViewData* GetViewData(PP_Instance instance) OVERRIDE; - virtual PP_Bool FlashIsFullscreen(PP_Instance instance) OVERRIDE; - virtual PP_Var GetWindowObject(PP_Instance instance) OVERRIDE; - virtual PP_Var GetOwnerElementObject(PP_Instance instance) OVERRIDE; + PP_Resource device) override; + virtual PP_Bool IsFullFrame(PP_Instance instance) override; + virtual const ppapi::ViewData* GetViewData(PP_Instance instance) override; + virtual PP_Bool FlashIsFullscreen(PP_Instance instance) override; + virtual PP_Var GetWindowObject(PP_Instance instance) override; + virtual PP_Var GetOwnerElementObject(PP_Instance instance) override; virtual PP_Var ExecuteScript(PP_Instance instance, PP_Var script, - PP_Var* exception) OVERRIDE; + PP_Var* exception) override; virtual uint32_t GetAudioHardwareOutputSampleRate(PP_Instance instance) - OVERRIDE; + override; virtual uint32_t GetAudioHardwareOutputBufferSize(PP_Instance instance) - OVERRIDE; - virtual PP_Var GetDefaultCharSet(PP_Instance instance) OVERRIDE; - virtual void SetPluginToHandleFindRequests(PP_Instance) OVERRIDE; + override; + virtual PP_Var GetDefaultCharSet(PP_Instance instance) override; + virtual void SetPluginToHandleFindRequests(PP_Instance) override; virtual void NumberOfFindResultsChanged(PP_Instance instance, int32_t total, - PP_Bool final_result) OVERRIDE; + PP_Bool final_result) override; virtual void SelectedFindResultChanged(PP_Instance instance, - int32_t index) OVERRIDE; + int32_t index) override; virtual void SetTickmarks(PP_Instance instance, const PP_Rect* tickmarks, - uint32_t count) OVERRIDE; - virtual PP_Bool IsFullscreen(PP_Instance instance) OVERRIDE; + uint32_t count) override; + virtual PP_Bool IsFullscreen(PP_Instance instance) override; virtual PP_Bool SetFullscreen(PP_Instance instance, - PP_Bool fullscreen) OVERRIDE; - virtual PP_Bool GetScreenSize(PP_Instance instance, PP_Size* size) OVERRIDE; + PP_Bool fullscreen) override; + virtual PP_Bool GetScreenSize(PP_Instance instance, PP_Size* size) override; virtual ppapi::Resource* GetSingletonResource(PP_Instance instance, ppapi::SingletonResourceID id) - OVERRIDE; + override; virtual int32_t RequestInputEvents(PP_Instance instance, - uint32_t event_classes) OVERRIDE; + uint32_t event_classes) override; virtual int32_t RequestFilteringInputEvents(PP_Instance instance, - uint32_t event_classes) OVERRIDE; + uint32_t event_classes) override; virtual void ClearInputEventRequest(PP_Instance instance, - uint32_t event_classes) OVERRIDE; - virtual void StartTrackingLatency(PP_Instance instance) OVERRIDE; - virtual void ZoomChanged(PP_Instance instance, double factor) OVERRIDE; + uint32_t event_classes) override; + virtual void StartTrackingLatency(PP_Instance instance) override; + virtual void ZoomChanged(PP_Instance instance, double factor) override; virtual void ZoomLimitsChanged(PP_Instance instance, double minimum_factor, - double maximum_factor) OVERRIDE; - virtual void PostMessage(PP_Instance instance, PP_Var message) OVERRIDE; + double maximum_factor) override; + virtual void PostMessage(PP_Instance instance, PP_Var message) override; virtual int32_t RegisterMessageHandler(PP_Instance instance, void* user_data, const PPP_MessageHandler_0_2* handler, - PP_Resource message_loop) OVERRIDE; + PP_Resource message_loop) override; virtual int32_t RegisterMessageHandler_1_1_Deprecated( PP_Instance instance, void* user_data, const PPP_MessageHandler_0_1_Deprecated* handler, - PP_Resource message_loop) OVERRIDE; - virtual void UnregisterMessageHandler(PP_Instance instance) OVERRIDE; + PP_Resource message_loop) override; + virtual void UnregisterMessageHandler(PP_Instance instance) override; virtual PP_Bool SetCursor(PP_Instance instance, PP_MouseCursor_Type type, PP_Resource image, - const PP_Point* hot_spot) OVERRIDE; + const PP_Point* hot_spot) override; virtual int32_t LockMouse(PP_Instance instance, scoped_refptr<ppapi::TrackedCallback> callback) - OVERRIDE; - virtual void UnlockMouse(PP_Instance instance) OVERRIDE; + override; + virtual void UnlockMouse(PP_Instance instance) override; virtual void SetTextInputType(PP_Instance instance, - PP_TextInput_Type type) OVERRIDE; + PP_TextInput_Type type) override; virtual void UpdateCaretPosition(PP_Instance instance, const PP_Rect& caret, - const PP_Rect& bounding_box) OVERRIDE; - virtual void CancelCompositionText(PP_Instance instance) OVERRIDE; - virtual void SelectionChanged(PP_Instance instance) OVERRIDE; + const PP_Rect& bounding_box) override; + virtual void CancelCompositionText(PP_Instance instance) override; + virtual void SelectionChanged(PP_Instance instance) override; virtual void UpdateSurroundingText(PP_Instance instance, const char* text, uint32_t caret, - uint32_t anchor) OVERRIDE; + uint32_t anchor) override; virtual PP_Var ResolveRelativeToDocument(PP_Instance instance, PP_Var relative, PP_URLComponents_Dev* components) - OVERRIDE; - virtual PP_Bool DocumentCanRequest(PP_Instance instance, PP_Var url) OVERRIDE; + override; + virtual PP_Bool DocumentCanRequest(PP_Instance instance, PP_Var url) override; virtual PP_Bool DocumentCanAccessDocument(PP_Instance instance, - PP_Instance target) OVERRIDE; + PP_Instance target) override; virtual PP_Var GetDocumentURL(PP_Instance instance, - PP_URLComponents_Dev* components) OVERRIDE; + PP_URLComponents_Dev* components) override; virtual PP_Var GetPluginInstanceURL(PP_Instance instance, PP_URLComponents_Dev* components) - OVERRIDE; + override; virtual PP_Var GetPluginReferrerURL(PP_Instance instance, PP_URLComponents_Dev* components) - OVERRIDE; + override; // PPB_ContentDecryptor_Private implementation. virtual void PromiseResolved(PP_Instance instance, - uint32 promise_id) OVERRIDE; + uint32 promise_id) override; virtual void PromiseResolvedWithSession(PP_Instance instance, uint32 promise_id, - PP_Var web_session_id_var) OVERRIDE; + PP_Var web_session_id_var) override; virtual void PromiseResolvedWithKeyIds(PP_Instance instance, uint32 promise_id, - PP_Var key_ids_var) OVERRIDE; + PP_Var key_ids_var) override; virtual void PromiseRejected(PP_Instance instance, uint32 promise_id, PP_CdmExceptionCode exception_code, uint32 system_code, - PP_Var error_description_var) OVERRIDE; + PP_Var error_description_var) override; virtual void SessionMessage(PP_Instance instance, PP_Var web_session_id_var, PP_Var message_var, - PP_Var destination_url_var) OVERRIDE; + PP_Var destination_url_var) override; virtual void SessionKeysChange(PP_Instance instance, PP_Var web_session_id_var, - PP_Bool has_additional_usable_key) OVERRIDE; + PP_Bool has_additional_usable_key) override; virtual void SessionExpirationChange(PP_Instance instance, PP_Var web_session_id_var, - PP_Time new_expiry_time) OVERRIDE; + PP_Time new_expiry_time) override; virtual void SessionReady(PP_Instance instance, - PP_Var web_session_id_var) OVERRIDE; + PP_Var web_session_id_var) override; virtual void SessionClosed(PP_Instance instance, - PP_Var web_session_id_var) OVERRIDE; + PP_Var web_session_id_var) override; virtual void SessionError(PP_Instance instance, PP_Var web_session_id_var, PP_CdmExceptionCode exception_code, uint32 system_code, - PP_Var error_description_var) OVERRIDE; + PP_Var error_description_var) override; virtual void DeliverBlock(PP_Instance instance, PP_Resource decrypted_block, - const PP_DecryptedBlockInfo* block_info) OVERRIDE; + const PP_DecryptedBlockInfo* block_info) override; virtual void DecoderInitializeDone(PP_Instance instance, PP_DecryptorStreamType decoder_type, uint32_t request_id, - PP_Bool success) OVERRIDE; + PP_Bool success) override; virtual void DecoderDeinitializeDone(PP_Instance instance, PP_DecryptorStreamType decoder_type, - uint32_t request_id) OVERRIDE; + uint32_t request_id) override; virtual void DecoderResetDone(PP_Instance instance, PP_DecryptorStreamType decoder_type, - uint32_t request_id) OVERRIDE; + uint32_t request_id) override; virtual void DeliverFrame(PP_Instance instance, PP_Resource decrypted_frame, - const PP_DecryptedFrameInfo* frame_info) OVERRIDE; + const PP_DecryptedFrameInfo* frame_info) override; virtual void DeliverSamples(PP_Instance instance, PP_Resource audio_frames, const PP_DecryptedSampleInfo* sample_info) - OVERRIDE; + override; // Reset this instance as proxied. Assigns the instance a new module, resets // cached interfaces to point to the out-of-process proxy and re-sends @@ -547,10 +547,10 @@ class CONTENT_EXPORT PepperPluginInstanceImpl virtual bool PrepareTextureMailbox( cc::TextureMailbox* mailbox, scoped_ptr<cc::SingleReleaseCallback>* release_callback, - bool use_shared_memory) OVERRIDE; + bool use_shared_memory) override; // RenderFrameObserver - virtual void OnDestruct() OVERRIDE; + virtual void OnDestruct() override; void AddLatencyInfo(const std::vector<ui::LatencyInfo>& latency_info); @@ -595,9 +595,9 @@ class CONTENT_EXPORT PepperPluginInstanceImpl public: GamepadImpl(); // Resource implementation. - virtual ppapi::thunk::PPB_Gamepad_API* AsPPB_Gamepad_API() OVERRIDE; + virtual ppapi::thunk::PPB_Gamepad_API* AsPPB_Gamepad_API() override; virtual void Sample(PP_Instance instance, - PP_GamepadsSampleData* data) OVERRIDE; + PP_GamepadsSampleData* data) override; private: virtual ~GamepadImpl(); diff --git a/content/renderer/pepper/pepper_proxy_channel_delegate_impl.h b/content/renderer/pepper/pepper_proxy_channel_delegate_impl.h index f4d58eb..a7e6765 100644 --- a/content/renderer/pepper/pepper_proxy_channel_delegate_impl.h +++ b/content/renderer/pepper/pepper_proxy_channel_delegate_impl.h @@ -16,12 +16,12 @@ class PepperProxyChannelDelegateImpl virtual ~PepperProxyChannelDelegateImpl(); // ProxyChannel::Delegate implementation. - virtual base::MessageLoopProxy* GetIPCMessageLoop() OVERRIDE; - virtual base::WaitableEvent* GetShutdownEvent() OVERRIDE; + virtual base::MessageLoopProxy* GetIPCMessageLoop() override; + virtual base::WaitableEvent* GetShutdownEvent() override; virtual IPC::PlatformFileForTransit ShareHandleWithRemote( base::PlatformFile handle, base::ProcessId remote_pid, - bool should_close_source) OVERRIDE; + bool should_close_source) override; }; } // namespace content diff --git a/content/renderer/pepper/pepper_try_catch.h b/content/renderer/pepper/pepper_try_catch.h index 382c378..6ac42d1 100644 --- a/content/renderer/pepper/pepper_try_catch.h +++ b/content/renderer/pepper/pepper_try_catch.h @@ -64,9 +64,9 @@ class PepperTryCatchV8 : public PepperTryCatch { PP_Var* exception() { return &exception_; } // PepperTryCatch - virtual void SetException(const char* message) OVERRIDE; - virtual bool HasException() OVERRIDE; - virtual v8::Handle<v8::Context> GetContext() OVERRIDE; + virtual void SetException(const char* message) override; + virtual bool HasException() override; + virtual v8::Handle<v8::Context> GetContext() override; private: PP_Var exception_; @@ -85,9 +85,9 @@ class PepperTryCatchVar : public PepperTryCatch { virtual ~PepperTryCatchVar(); // PepperTryCatch - virtual void SetException(const char* message) OVERRIDE; - virtual bool HasException() OVERRIDE; - virtual v8::Handle<v8::Context> GetContext() OVERRIDE; + virtual void SetException(const char* message) override; + virtual bool HasException() override; + virtual v8::Handle<v8::Context> GetContext() override; private: // Code which uses PepperTryCatchVar doesn't typically have a HandleScope, diff --git a/content/renderer/pepper/pepper_url_loader_host.h b/content/renderer/pepper/pepper_url_loader_host.h index e298659..7f70239 100644 --- a/content/renderer/pepper/pepper_url_loader_host.h +++ b/content/renderer/pepper/pepper_url_loader_host.h @@ -39,7 +39,7 @@ class PepperURLLoaderHost : public ppapi::host::ResourceHost, // ResourceHost implementation. virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; // blink::WebURLLoaderClient implementation. virtual void willSendRequest(blink::WebURLLoader* loader, @@ -65,7 +65,7 @@ class PepperURLLoaderHost : public ppapi::host::ResourceHost, private: // ResourceHost protected overrides. - virtual void DidConnectPendingHostToResource() OVERRIDE; + virtual void DidConnectPendingHostToResource() override; // IPC messages int32_t OnHostMsgOpen(ppapi::host::HostMessageContext* context, diff --git a/content/renderer/pepper/pepper_url_request_unittest.cc b/content/renderer/pepper/pepper_url_request_unittest.cc index da7be19..bafccfe 100644 --- a/content/renderer/pepper/pepper_url_request_unittest.cc +++ b/content/renderer/pepper/pepper_url_request_unittest.cc @@ -57,7 +57,7 @@ class URLRequestInfoTest : public RenderViewTest { // url_request_info_util.cc to detect that this is a test instance. URLRequestInfoTest() : pp_instance_(-1) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { RenderViewTest::SetUp(); ppapi::ProxyLock::DisableLockingOnThreadForTest(); @@ -68,7 +68,7 @@ class URLRequestInfoTest : public RenderViewTest { ppapi::proxy::Connection(), pp_instance_, URLRequestInfoData()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { test_globals_.GetResourceTracker()->DidDeleteInstance(pp_instance_); RenderViewTest::TearDown(); } diff --git a/content/renderer/pepper/pepper_video_capture_host.h b/content/renderer/pepper/pepper_video_capture_host.h index 8326c5e..38327af 100644 --- a/content/renderer/pepper/pepper_video_capture_host.h +++ b/content/renderer/pepper/pepper_video_capture_host.h @@ -37,7 +37,7 @@ class PepperVideoCaptureHost : public ppapi::host::ResourceHost { virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; // These methods are called by PepperPlatformVideoCapture only. diff --git a/content/renderer/pepper/pepper_video_decoder_host.h b/content/renderer/pepper/pepper_video_decoder_host.h index 0ee83b2..e7f9ea0 100644 --- a/content/renderer/pepper/pepper_video_decoder_host.h +++ b/content/renderer/pepper/pepper_video_decoder_host.h @@ -54,18 +54,18 @@ class CONTENT_EXPORT PepperVideoDecoderHost // ResourceHost implementation. virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; // media::VideoDecodeAccelerator::Client implementation. virtual void ProvidePictureBuffers(uint32 requested_num_of_buffers, const gfx::Size& dimensions, - uint32 texture_target) OVERRIDE; - virtual void DismissPictureBuffer(int32 picture_buffer_id) OVERRIDE; - virtual void PictureReady(const media::Picture& picture) OVERRIDE; - virtual void NotifyEndOfBitstreamBuffer(int32 bitstream_buffer_id) OVERRIDE; - virtual void NotifyFlushDone() OVERRIDE; - virtual void NotifyResetDone() OVERRIDE; - virtual void NotifyError(media::VideoDecodeAccelerator::Error error) OVERRIDE; + uint32 texture_target) override; + virtual void DismissPictureBuffer(int32 picture_buffer_id) override; + virtual void PictureReady(const media::Picture& picture) override; + virtual void NotifyEndOfBitstreamBuffer(int32 bitstream_buffer_id) override; + virtual void NotifyFlushDone() override; + virtual void NotifyResetDone() override; + virtual void NotifyError(media::VideoDecodeAccelerator::Error error) override; int32_t OnHostMsgInitialize(ppapi::host::HostMessageContext* context, const ppapi::HostResource& graphics_context, diff --git a/content/renderer/pepper/pepper_video_destination_host.h b/content/renderer/pepper/pepper_video_destination_host.h index 277b668..2e00c8f 100644 --- a/content/renderer/pepper/pepper_video_destination_host.h +++ b/content/renderer/pepper/pepper_video_destination_host.h @@ -28,7 +28,7 @@ class CONTENT_EXPORT PepperVideoDestinationHost virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; private: int32_t OnHostMsgOpen(ppapi::host::HostMessageContext* context, diff --git a/content/renderer/pepper/pepper_video_source_host.h b/content/renderer/pepper/pepper_video_source_host.h index 5ee8860..8a0a9bb 100644 --- a/content/renderer/pepper/pepper_video_source_host.h +++ b/content/renderer/pepper/pepper_video_source_host.h @@ -32,7 +32,7 @@ class CONTENT_EXPORT PepperVideoSourceHost : public ppapi::host::ResourceHost { virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; private: // This helper object receives frames on a video worker thread and passes @@ -44,7 +44,7 @@ class CONTENT_EXPORT PepperVideoSourceHost : public ppapi::host::ResourceHost { // FrameReaderInterface implementation. virtual void GotFrame(const scoped_refptr<media::VideoFrame>& frame) - OVERRIDE; + override; private: friend class base::RefCountedThreadSafe<FrameReceiver>; diff --git a/content/renderer/pepper/pepper_webplugin_impl.h b/content/renderer/pepper/pepper_webplugin_impl.h index 291e5c1..c11bceb 100644 --- a/content/renderer/pepper/pepper_webplugin_impl.h +++ b/content/renderer/pepper/pepper_webplugin_impl.h @@ -42,7 +42,7 @@ class PepperWebPluginImpl : public blink::WebPlugin { virtual bool initialize(blink::WebPluginContainer* container); virtual void destroy(); virtual v8::Local<v8::Object> v8ScriptableObject( - v8::Isolate* isolate) OVERRIDE; + v8::Isolate* isolate) override; virtual bool getFormValue(blink::WebString& value); virtual void paint(blink::WebCanvas* canvas, const blink::WebRect& rect); virtual void updateGeometry( @@ -74,16 +74,16 @@ class PepperWebPluginImpl : public blink::WebPlugin { int identifier); virtual void selectFindResult(bool forward); virtual void stopFind(); - virtual bool supportsPaginatedPrint() OVERRIDE; - virtual bool isPrintScalingDisabled() OVERRIDE; + virtual bool supportsPaginatedPrint() override; + virtual bool isPrintScalingDisabled() override; - virtual int printBegin(const blink::WebPrintParams& print_params) OVERRIDE; - virtual bool printPage(int page_number, blink::WebCanvas* canvas) OVERRIDE; - virtual void printEnd() OVERRIDE; + virtual int printBegin(const blink::WebPrintParams& print_params) override; + virtual bool printPage(int page_number, blink::WebCanvas* canvas) override; + virtual void printEnd() override; - virtual bool canRotateView() OVERRIDE; - virtual void rotateView(RotationType type) OVERRIDE; - virtual bool isPlaceholder() OVERRIDE; + virtual bool canRotateView() override; + virtual void rotateView(RotationType type) override; + virtual bool isPlaceholder() override; private: friend class base::DeleteHelper<PepperWebPluginImpl>; diff --git a/content/renderer/pepper/pepper_websocket_host.h b/content/renderer/pepper/pepper_websocket_host.h index 091b3e1..f5137b3 100644 --- a/content/renderer/pepper/pepper_websocket_host.h +++ b/content/renderer/pepper/pepper_websocket_host.h @@ -36,7 +36,7 @@ class CONTENT_EXPORT PepperWebSocketHost virtual int32_t OnResourceMessageReceived( const IPC::Message& msg, - ppapi::host::HostMessageContext* context) OVERRIDE; + ppapi::host::HostMessageContext* context) override; // WebSocketClient implementation. virtual void didConnect(); diff --git a/content/renderer/pepper/plugin_object.h b/content/renderer/pepper/plugin_object.h index 4f640b8..f816b32 100644 --- a/content/renderer/pepper/plugin_object.h +++ b/content/renderer/pepper/plugin_object.h @@ -48,9 +48,9 @@ class PluginObject : public gin::Wrappable<PluginObject>, // gin::NamedPropertyInterceptor virtual v8::Local<v8::Value> GetNamedProperty( v8::Isolate* isolate, - const std::string& property) OVERRIDE; + const std::string& property) override; virtual std::vector<std::string> EnumerateNamedProperties( - v8::Isolate* isolate) OVERRIDE; + v8::Isolate* isolate) override; const PPP_Class_Deprecated* ppp_class() { return ppp_class_; } void* ppp_class_data() { return ppp_class_data_; } @@ -65,7 +65,7 @@ class PluginObject : public gin::Wrappable<PluginObject>, // gin::Wrappable virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder( - v8::Isolate* isolate) OVERRIDE; + v8::Isolate* isolate) override; // Helper method to get named properties. v8::Local<v8::Value> GetPropertyOrMethod(v8::Isolate* isolate, diff --git a/content/renderer/pepper/ppb_audio_impl.h b/content/renderer/pepper/ppb_audio_impl.h index ecd49eb..2712e23 100644 --- a/content/renderer/pepper/ppb_audio_impl.h +++ b/content/renderer/pepper/ppb_audio_impl.h @@ -33,17 +33,17 @@ class PPB_Audio_Impl : public ppapi::Resource, explicit PPB_Audio_Impl(PP_Instance instance); // Resource overrides. - virtual ppapi::thunk::PPB_Audio_API* AsPPB_Audio_API() OVERRIDE; + virtual ppapi::thunk::PPB_Audio_API* AsPPB_Audio_API() override; // PPB_Audio_API implementation. - virtual PP_Resource GetCurrentConfig() OVERRIDE; - virtual PP_Bool StartPlayback() OVERRIDE; - virtual PP_Bool StopPlayback() OVERRIDE; + virtual PP_Resource GetCurrentConfig() override; + virtual PP_Bool StartPlayback() override; + virtual PP_Bool StopPlayback() override; virtual int32_t Open(PP_Resource config_id, scoped_refptr<ppapi::TrackedCallback> create_callback) - OVERRIDE; - virtual int32_t GetSyncSocket(int* sync_socket) OVERRIDE; - virtual int32_t GetSharedMemory(int* shm_handle, uint32_t* shm_size) OVERRIDE; + override; + virtual int32_t GetSyncSocket(int* sync_socket) override; + virtual int32_t GetSharedMemory(int* shm_handle, uint32_t* shm_size) override; private: virtual ~PPB_Audio_Impl(); @@ -51,7 +51,7 @@ class PPB_Audio_Impl : public ppapi::Resource, // AudioHelper implementation. virtual void OnSetStreamInfo(base::SharedMemoryHandle shared_memory_handle, size_t shared_memory_size_, - base::SyncSocket::Handle socket) OVERRIDE; + base::SyncSocket::Handle socket) override; // AudioConfig used for creating this Audio object. We own a ref. ppapi::ScopedPPResource config_; diff --git a/content/renderer/pepper/ppb_broker_impl.h b/content/renderer/pepper/ppb_broker_impl.h index 0e77218..4b5e777 100644 --- a/content/renderer/pepper/ppb_broker_impl.h +++ b/content/renderer/pepper/ppb_broker_impl.h @@ -33,12 +33,12 @@ class PPB_Broker_Impl : public ppapi::Resource, explicit PPB_Broker_Impl(PP_Instance instance); // Resource override. - virtual ppapi::thunk::PPB_Broker_API* AsPPB_Broker_API() OVERRIDE; + virtual ppapi::thunk::PPB_Broker_API* AsPPB_Broker_API() override; // PPB_BrokerTrusted implementation. virtual int32_t Connect( - scoped_refptr<ppapi::TrackedCallback> connect_callback) OVERRIDE; - virtual int32_t GetHandle(int32_t* handle) OVERRIDE; + scoped_refptr<ppapi::TrackedCallback> connect_callback) override; + virtual int32_t GetHandle(int32_t* handle) override; // Returns the URL of the document this plug-in runs in. This is necessary to // decide whether to grant access to the PPAPI broker. @@ -50,7 +50,7 @@ class PPB_Broker_Impl : public ppapi::Resource, virtual ~PPB_Broker_Impl(); // IPC::Listener implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; void OnPpapiBrokerChannelCreated(base::ProcessId broker_pid, const IPC::ChannelHandle& handle); diff --git a/content/renderer/pepper/ppb_buffer_impl.h b/content/renderer/pepper/ppb_buffer_impl.h index 7652622..b2c316b 100644 --- a/content/renderer/pepper/ppb_buffer_impl.h +++ b/content/renderer/pepper/ppb_buffer_impl.h @@ -27,16 +27,16 @@ class PPB_Buffer_Impl : public ppapi::Resource, uint32_t size() const { return size_; } // Resource overrides. - virtual ppapi::thunk::PPB_Buffer_API* AsPPB_Buffer_API() OVERRIDE; + virtual ppapi::thunk::PPB_Buffer_API* AsPPB_Buffer_API() override; // PPB_Buffer_API implementation. - virtual PP_Bool Describe(uint32_t* size_in_bytes) OVERRIDE; - virtual PP_Bool IsMapped() OVERRIDE; - virtual void* Map() OVERRIDE; - virtual void Unmap() OVERRIDE; + virtual PP_Bool Describe(uint32_t* size_in_bytes) override; + virtual PP_Bool IsMapped() override; + virtual void* Map() override; + virtual void Unmap() override; // Trusted. - virtual int32_t GetSharedMemory(int* handle) OVERRIDE; + virtual int32_t GetSharedMemory(int* handle) override; private: virtual ~PPB_Buffer_Impl(); diff --git a/content/renderer/pepper/ppb_flash_message_loop_impl.h b/content/renderer/pepper/ppb_flash_message_loop_impl.h index b26d4ce..a33f351 100644 --- a/content/renderer/pepper/ppb_flash_message_loop_impl.h +++ b/content/renderer/pepper/ppb_flash_message_loop_impl.h @@ -21,13 +21,13 @@ class PPB_Flash_MessageLoop_Impl // Resource. virtual ppapi::thunk::PPB_Flash_MessageLoop_API* AsPPB_Flash_MessageLoop_API() - OVERRIDE; + override; // PPB_Flash_MessageLoop_API implementation. - virtual int32_t Run() OVERRIDE; - virtual void Quit() OVERRIDE; + virtual int32_t Run() override; + virtual void Quit() override; virtual void RunFromHostProxy(const RunFromHostProxyCallback& callback) - OVERRIDE; + override; private: class State; diff --git a/content/renderer/pepper/ppb_graphics_3d_impl.h b/content/renderer/pepper/ppb_graphics_3d_impl.h index 5ad1fce..0842456 100644 --- a/content/renderer/pepper/ppb_graphics_3d_impl.h +++ b/content/renderer/pepper/ppb_graphics_3d_impl.h @@ -27,19 +27,19 @@ class PPB_Graphics3D_Impl : public ppapi::PPB_Graphics3D_Shared { base::SharedMemoryHandle* shared_state_handle); // PPB_Graphics3D_API trusted implementation. - virtual PP_Bool SetGetBuffer(int32_t transfer_buffer_id) OVERRIDE; + virtual PP_Bool SetGetBuffer(int32_t transfer_buffer_id) override; virtual scoped_refptr<gpu::Buffer> CreateTransferBuffer(uint32_t size, - int32* id) OVERRIDE; - virtual PP_Bool DestroyTransferBuffer(int32_t id) OVERRIDE; - virtual PP_Bool Flush(int32_t put_offset) OVERRIDE; + int32* id) override; + virtual PP_Bool DestroyTransferBuffer(int32_t id) override; + virtual PP_Bool Flush(int32_t put_offset) override; virtual gpu::CommandBuffer::State WaitForTokenInRange(int32_t start, - int32_t end) OVERRIDE; + int32_t end) override; virtual gpu::CommandBuffer::State WaitForGetOffsetInRange(int32_t start, int32_t end) - OVERRIDE; - virtual uint32_t InsertSyncPoint() OVERRIDE; - virtual uint32_t InsertFutureSyncPoint() OVERRIDE; - virtual void RetireSyncPoint(uint32_t) OVERRIDE; + override; + virtual uint32_t InsertSyncPoint() override; + virtual uint32_t InsertFutureSyncPoint() override; + virtual void RetireSyncPoint(uint32_t) override; // Binds/unbinds the graphics of this context with the associated instance. // Returns true if binding/unbinding is successful. @@ -65,9 +65,9 @@ class PPB_Graphics3D_Impl : public ppapi::PPB_Graphics3D_Shared { protected: virtual ~PPB_Graphics3D_Impl(); // ppapi::PPB_Graphics3D_Shared overrides. - virtual gpu::CommandBuffer* GetCommandBuffer() OVERRIDE; - virtual gpu::GpuControl* GetGpuControl() OVERRIDE; - virtual int32 DoSwapBuffers() OVERRIDE; + virtual gpu::CommandBuffer* GetCommandBuffer() override; + virtual gpu::GpuControl* GetGpuControl() override; + virtual int32 DoSwapBuffers() override; private: explicit PPB_Graphics3D_Impl(PP_Instance instance); diff --git a/content/renderer/pepper/ppb_image_data_impl.h b/content/renderer/pepper/ppb_image_data_impl.h index 3ec7986..5ea6c38 100644 --- a/content/renderer/pepper/ppb_image_data_impl.h +++ b/content/renderer/pepper/ppb_image_data_impl.h @@ -84,16 +84,16 @@ class CONTENT_EXPORT PPB_ImageData_Impl TransportDIB* GetTransportDIB() const; // Resource override. - virtual ppapi::thunk::PPB_ImageData_API* AsPPB_ImageData_API() OVERRIDE; + virtual ppapi::thunk::PPB_ImageData_API* AsPPB_ImageData_API() override; // PPB_ImageData_API implementation. - virtual PP_Bool Describe(PP_ImageDataDesc* desc) OVERRIDE; - virtual void* Map() OVERRIDE; - virtual void Unmap() OVERRIDE; - virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) OVERRIDE; - virtual SkCanvas* GetPlatformCanvas() OVERRIDE; - virtual SkCanvas* GetCanvas() OVERRIDE; - virtual void SetIsCandidateForReuse() OVERRIDE; + virtual PP_Bool Describe(PP_ImageDataDesc* desc) override; + virtual void* Map() override; + virtual void Unmap() override; + virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) override; + virtual SkCanvas* GetPlatformCanvas() override; + virtual SkCanvas* GetCanvas() override; + virtual void SetIsCandidateForReuse() override; const SkBitmap* GetMappedBitmap() const; @@ -120,15 +120,15 @@ class ImageDataPlatformBackend : public PPB_ImageData_Impl::Backend { PP_ImageDataFormat format, int width, int height, - bool init_to_zero) OVERRIDE; - virtual bool IsMapped() const OVERRIDE; - virtual TransportDIB* GetTransportDIB() const OVERRIDE; - virtual void* Map() OVERRIDE; - virtual void Unmap() OVERRIDE; - virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) OVERRIDE; - virtual SkCanvas* GetPlatformCanvas() OVERRIDE; - virtual SkCanvas* GetCanvas() OVERRIDE; - virtual const SkBitmap* GetMappedBitmap() const OVERRIDE; + bool init_to_zero) override; + virtual bool IsMapped() const override; + virtual TransportDIB* GetTransportDIB() const override; + virtual void* Map() override; + virtual void Unmap() override; + virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) override; + virtual SkCanvas* GetPlatformCanvas() override; + virtual SkCanvas* GetCanvas() override; + virtual const SkBitmap* GetMappedBitmap() const override; private: // This will be NULL before initialization, and if this PPB_ImageData_Impl is @@ -155,15 +155,15 @@ class ImageDataSimpleBackend : public PPB_ImageData_Impl::Backend { PP_ImageDataFormat format, int width, int height, - bool init_to_zero) OVERRIDE; - virtual bool IsMapped() const OVERRIDE; - virtual TransportDIB* GetTransportDIB() const OVERRIDE; - virtual void* Map() OVERRIDE; - virtual void Unmap() OVERRIDE; - virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) OVERRIDE; - virtual SkCanvas* GetPlatformCanvas() OVERRIDE; - virtual SkCanvas* GetCanvas() OVERRIDE; - virtual const SkBitmap* GetMappedBitmap() const OVERRIDE; + bool init_to_zero) override; + virtual bool IsMapped() const override; + virtual TransportDIB* GetTransportDIB() const override; + virtual void* Map() override; + virtual void Unmap() override; + virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) override; + virtual SkCanvas* GetPlatformCanvas() override; + virtual SkCanvas* GetCanvas() override; + virtual const SkBitmap* GetMappedBitmap() const override; private: scoped_ptr<base::SharedMemory> shared_memory_; diff --git a/content/renderer/pepper/ppb_scrollbar_impl.h b/content/renderer/pepper/ppb_scrollbar_impl.h index 6eeee80e..d78c586 100644 --- a/content/renderer/pepper/ppb_scrollbar_impl.h +++ b/content/renderer/pepper/ppb_scrollbar_impl.h @@ -25,17 +25,17 @@ class PPB_Scrollbar_Impl : public PPB_Widget_Impl, static PP_Resource Create(PP_Instance instance, bool vertical); // Resource overrides. - virtual PPB_Scrollbar_API* AsPPB_Scrollbar_API() OVERRIDE; - virtual void InstanceWasDeleted() OVERRIDE; + virtual PPB_Scrollbar_API* AsPPB_Scrollbar_API() override; + virtual void InstanceWasDeleted() override; // PPB_Scrollbar_API implementation. - virtual uint32_t GetThickness() OVERRIDE; - virtual bool IsOverlay() OVERRIDE; - virtual uint32_t GetValue() OVERRIDE; - virtual void SetValue(uint32_t value) OVERRIDE; - virtual void SetDocumentSize(uint32_t size) OVERRIDE; - virtual void SetTickMarks(const PP_Rect* tick_marks, uint32_t count) OVERRIDE; - virtual void ScrollBy(PP_ScrollBy_Dev unit, int32_t multiplier) OVERRIDE; + virtual uint32_t GetThickness() override; + virtual bool IsOverlay() override; + virtual uint32_t GetValue() override; + virtual void SetValue(uint32_t value) override; + virtual void SetDocumentSize(uint32_t size) override; + virtual void SetTickMarks(const PP_Rect* tick_marks, uint32_t count) override; + virtual void ScrollBy(PP_ScrollBy_Dev unit, int32_t multiplier) override; private: virtual ~PPB_Scrollbar_Impl(); @@ -45,19 +45,19 @@ class PPB_Scrollbar_Impl : public PPB_Widget_Impl, // PPB_Widget private implementation. virtual PP_Bool PaintInternal(const gfx::Rect& rect, - PPB_ImageData_Impl* image) OVERRIDE; + PPB_ImageData_Impl* image) override; virtual PP_Bool HandleEventInternal(const ppapi::InputEventData& data) - OVERRIDE; - virtual void SetLocationInternal(const PP_Rect* location) OVERRIDE; + override; + virtual void SetLocationInternal(const PP_Rect* location) override; // blink::WebPluginScrollbarClient implementation. - virtual void valueChanged(blink::WebPluginScrollbar* scrollbar) OVERRIDE; - virtual void overlayChanged(blink::WebPluginScrollbar* scrollbar) OVERRIDE; + virtual void valueChanged(blink::WebPluginScrollbar* scrollbar) override; + virtual void overlayChanged(blink::WebPluginScrollbar* scrollbar) override; virtual void invalidateScrollbarRect(blink::WebPluginScrollbar* scrollbar, - const blink::WebRect& rect) OVERRIDE; + const blink::WebRect& rect) override; virtual void getTickmarks(blink::WebPluginScrollbar* scrollbar, blink::WebVector<blink::WebRect>* tick_marks) const - OVERRIDE; + override; void NotifyInvalidate(); diff --git a/content/renderer/pepper/ppb_video_decoder_impl.h b/content/renderer/pepper/ppb_video_decoder_impl.h index c099950..6fdd36a 100644 --- a/content/renderer/pepper/ppb_video_decoder_impl.h +++ b/content/renderer/pepper/ppb_video_decoder_impl.h @@ -34,27 +34,27 @@ class PPB_VideoDecoder_Impl : public ppapi::PPB_VideoDecoder_Shared, // PPB_VideoDecoder_Dev_API implementation. virtual int32_t Decode(const PP_VideoBitstreamBuffer_Dev* bitstream_buffer, scoped_refptr<ppapi::TrackedCallback> callback) - OVERRIDE; + override; virtual void AssignPictureBuffers(uint32_t no_of_buffers, const PP_PictureBuffer_Dev* buffers) - OVERRIDE; - virtual void ReusePictureBuffer(int32_t picture_buffer_id) OVERRIDE; + override; + virtual void ReusePictureBuffer(int32_t picture_buffer_id) override; virtual int32_t Flush(scoped_refptr<ppapi::TrackedCallback> callback) - OVERRIDE; + override; virtual int32_t Reset(scoped_refptr<ppapi::TrackedCallback> callback) - OVERRIDE; - virtual void Destroy() OVERRIDE; + override; + virtual void Destroy() override; // media::VideoDecodeAccelerator::Client implementation. virtual void ProvidePictureBuffers(uint32 requested_num_of_buffers, const gfx::Size& dimensions, - uint32 texture_target) OVERRIDE; - virtual void DismissPictureBuffer(int32 picture_buffer_id) OVERRIDE; - virtual void PictureReady(const media::Picture& picture) OVERRIDE; - virtual void NotifyError(media::VideoDecodeAccelerator::Error error) OVERRIDE; - virtual void NotifyFlushDone() OVERRIDE; - virtual void NotifyEndOfBitstreamBuffer(int32 buffer_id) OVERRIDE; - virtual void NotifyResetDone() OVERRIDE; + uint32 texture_target) override; + virtual void DismissPictureBuffer(int32 picture_buffer_id) override; + virtual void PictureReady(const media::Picture& picture) override; + virtual void NotifyError(media::VideoDecodeAccelerator::Error error) override; + virtual void NotifyFlushDone() override; + virtual void NotifyEndOfBitstreamBuffer(int32 buffer_id) override; + virtual void NotifyResetDone() override; private: virtual ~PPB_VideoDecoder_Impl(); diff --git a/content/renderer/pepper/ppb_widget_impl.h b/content/renderer/pepper/ppb_widget_impl.h index db6feb3..f8f0262 100644 --- a/content/renderer/pepper/ppb_widget_impl.h +++ b/content/renderer/pepper/ppb_widget_impl.h @@ -28,14 +28,14 @@ class PPB_Widget_Impl : public ppapi::Resource, explicit PPB_Widget_Impl(PP_Instance instance); // Resource overrides. - virtual ppapi::thunk::PPB_Widget_API* AsPPB_Widget_API() OVERRIDE; + virtual ppapi::thunk::PPB_Widget_API* AsPPB_Widget_API() override; // PPB_WidgetAPI implementation. - virtual PP_Bool Paint(const PP_Rect* rect, PP_Resource) OVERRIDE; - virtual PP_Bool HandleEvent(PP_Resource pp_input_event) OVERRIDE; - virtual PP_Bool GetLocation(PP_Rect* location) OVERRIDE; - virtual void SetLocation(const PP_Rect* location) OVERRIDE; - virtual void SetScale(float scale) OVERRIDE; + virtual PP_Bool Paint(const PP_Rect* rect, PP_Resource) override; + virtual PP_Bool HandleEvent(PP_Resource pp_input_event) override; + virtual PP_Bool GetLocation(PP_Rect* location) override; + virtual void SetLocation(const PP_Rect* location) override; + virtual void SetScale(float scale) override; // Notifies the plugin instance that the given rect needs to be repainted. void Invalidate(const PP_Rect* dirty); diff --git a/content/renderer/pepper/renderer_ppapi_host_impl.h b/content/renderer/pepper/renderer_ppapi_host_impl.h index a30735d..dbca882 100644 --- a/content/renderer/pepper/renderer_ppapi_host_impl.h +++ b/content/renderer/pepper/renderer_ppapi_host_impl.h @@ -76,34 +76,34 @@ class RendererPpapiHostImpl : public RendererPpapiHost { bool IsExternalPluginHost() const; // RendererPpapiHost implementation. - virtual ppapi::host::PpapiHost* GetPpapiHost() OVERRIDE; - virtual bool IsValidInstance(PP_Instance instance) const OVERRIDE; + virtual ppapi::host::PpapiHost* GetPpapiHost() override; + virtual bool IsValidInstance(PP_Instance instance) const override; virtual PepperPluginInstance* GetPluginInstance(PP_Instance instance) const - OVERRIDE; + override; virtual RenderFrame* GetRenderFrameForInstance(PP_Instance instance) const - OVERRIDE; + override; virtual RenderView* GetRenderViewForInstance(PP_Instance instance) const - OVERRIDE; + override; virtual blink::WebPluginContainer* GetContainerForInstance( - PP_Instance instance) const OVERRIDE; - virtual base::ProcessId GetPluginPID() const OVERRIDE; - virtual bool HasUserGesture(PP_Instance instance) const OVERRIDE; - virtual int GetRoutingIDForWidget(PP_Instance instance) const OVERRIDE; + PP_Instance instance) const override; + virtual base::ProcessId GetPluginPID() const override; + virtual bool HasUserGesture(PP_Instance instance) const override; + virtual int GetRoutingIDForWidget(PP_Instance instance) const override; virtual gfx::Point PluginPointToRenderFrame(PP_Instance instance, const gfx::Point& pt) const - OVERRIDE; + override; virtual IPC::PlatformFileForTransit ShareHandleWithRemote( base::PlatformFile handle, - bool should_close_source) OVERRIDE; - virtual bool IsRunningInProcess() const OVERRIDE; - virtual std::string GetPluginName() const OVERRIDE; - virtual void SetToExternalPluginHost() OVERRIDE; + bool should_close_source) override; + virtual bool IsRunningInProcess() const override; + virtual std::string GetPluginName() const override; + virtual void SetToExternalPluginHost() override; virtual void CreateBrowserResourceHosts( PP_Instance instance, const std::vector<IPC::Message>& nested_msgs, const base::Callback<void(const std::vector<int>&)>& callback) const - OVERRIDE; - virtual GURL GetDocumentURL(PP_Instance instance) const OVERRIDE; + override; + virtual GURL GetDocumentURL(PP_Instance instance) const override; private: RendererPpapiHostImpl(PluginModule* module, diff --git a/content/renderer/pepper/resource_converter.h b/content/renderer/pepper/resource_converter.h index 842f7c7..ddcbbc1 100644 --- a/content/renderer/pepper/resource_converter.h +++ b/content/renderer/pepper/resource_converter.h @@ -69,16 +69,16 @@ class ResourceConverterImpl : public ResourceConverter { virtual ~ResourceConverterImpl(); // ResourceConverter overrides. - virtual void Reset() OVERRIDE; - virtual bool NeedsFlush() OVERRIDE; - virtual void Flush(const base::Callback<void(bool)>& callback) OVERRIDE; + virtual void Reset() override; + virtual bool NeedsFlush() override; + virtual void Flush(const base::Callback<void(bool)>& callback) override; virtual bool FromV8Value(v8::Handle<v8::Object> val, v8::Handle<v8::Context> context, PP_Var* result, - bool* was_resource) OVERRIDE; + bool* was_resource) override; virtual bool ToV8Value(const PP_Var& var, v8::Handle<v8::Context> context, - v8::Handle<v8::Value>* result) OVERRIDE; + v8::Handle<v8::Value>* result) override; private: // Creates a resource var with the given |pending_renderer_id| and diff --git a/content/renderer/pepper/resource_creation_impl.h b/content/renderer/pepper/resource_creation_impl.h index 6439c71..d96b136 100644 --- a/content/renderer/pepper/resource_creation_impl.h +++ b/content/renderer/pepper/resource_creation_impl.h @@ -26,46 +26,46 @@ class ResourceCreationImpl : public ppapi::thunk::ResourceCreationAPI { virtual PP_Resource CreateAudio1_0(PP_Instance instance, PP_Resource config_id, PPB_Audio_Callback_1_0 audio_callback, - void* user_data) OVERRIDE; + void* user_data) override; virtual PP_Resource CreateAudio(PP_Instance instance, PP_Resource config_id, PPB_Audio_Callback audio_callback, - void* user_data) OVERRIDE; - virtual PP_Resource CreateAudioTrusted(PP_Instance instance) OVERRIDE; + void* user_data) override; + virtual PP_Resource CreateAudioTrusted(PP_Instance instance) override; virtual PP_Resource CreateAudioConfig(PP_Instance instance, PP_AudioSampleRate sample_rate, - uint32_t sample_frame_count) OVERRIDE; - virtual PP_Resource CreateAudioInput(PP_Instance instance) OVERRIDE; - virtual PP_Resource CreateCompositor(PP_Instance instance) OVERRIDE; - virtual PP_Resource CreateBroker(PP_Instance instance) OVERRIDE; + uint32_t sample_frame_count) override; + virtual PP_Resource CreateAudioInput(PP_Instance instance) override; + virtual PP_Resource CreateCompositor(PP_Instance instance) override; + virtual PP_Resource CreateBroker(PP_Instance instance) override; virtual PP_Resource CreateBuffer(PP_Instance instance, - uint32_t size) OVERRIDE; - virtual PP_Resource CreateFlashDRM(PP_Instance instance) OVERRIDE; + uint32_t size) override; + virtual PP_Resource CreateFlashDRM(PP_Instance instance) override; virtual PP_Resource CreateFlashFontFile( PP_Instance instance, const PP_BrowserFont_Trusted_Description* description, - PP_PrivateFontCharset charset) OVERRIDE; + PP_PrivateFontCharset charset) override; virtual PP_Resource CreateFlashMenu(PP_Instance instance, - const PP_Flash_Menu* menu_data) OVERRIDE; - virtual PP_Resource CreateFlashMessageLoop(PP_Instance instance) OVERRIDE; + const PP_Flash_Menu* menu_data) override; + virtual PP_Resource CreateFlashMessageLoop(PP_Instance instance) override; virtual PP_Resource CreateGraphics3D(PP_Instance instance, PP_Resource share_context, - const int32_t* attrib_list) OVERRIDE; + const int32_t* attrib_list) override; virtual PP_Resource CreateGraphics3DRaw( PP_Instance instance, PP_Resource share_context, const int32_t* attrib_list, - base::SharedMemoryHandle* shared_state) OVERRIDE; - virtual PP_Resource CreateHostResolver(PP_Instance instance) OVERRIDE; - virtual PP_Resource CreateHostResolverPrivate(PP_Instance instance) OVERRIDE; + base::SharedMemoryHandle* shared_state) override; + virtual PP_Resource CreateHostResolver(PP_Instance instance) override; + virtual PP_Resource CreateHostResolverPrivate(PP_Instance instance) override; virtual PP_Resource CreateImageData(PP_Instance instance, PP_ImageDataFormat format, const PP_Size* size, - PP_Bool init_to_zero) OVERRIDE; + PP_Bool init_to_zero) override; virtual PP_Resource CreateImageDataSimple(PP_Instance instance, PP_ImageDataFormat format, const PP_Size* size, - PP_Bool init_to_zero) OVERRIDE; + PP_Bool init_to_zero) override; virtual PP_Resource CreateIMEInputEvent(PP_Instance instance, PP_InputEvent_Type type, PP_TimeTicks time_stamp, @@ -74,23 +74,23 @@ class ResourceCreationImpl : public ppapi::thunk::ResourceCreationAPI { const uint32_t* segment_offsets, int32_t target_segment, uint32_t selection_start, - uint32_t selection_end) OVERRIDE; + uint32_t selection_end) override; virtual PP_Resource CreateKeyboardInputEvent_1_0(PP_Instance instance, PP_InputEvent_Type type, PP_TimeTicks time_stamp, uint32_t modifiers, uint32_t key_code, PP_Var character_text) - OVERRIDE; + override; virtual PP_Resource CreateKeyboardInputEvent_1_2(PP_Instance instance, PP_InputEvent_Type type, PP_TimeTicks time_stamp, uint32_t modifiers, uint32_t key_code, PP_Var character_text, - PP_Var code) OVERRIDE; + PP_Var code) override; virtual PP_Resource CreateMediaStreamVideoTrack( - PP_Instance instance) OVERRIDE; + PP_Instance instance) override; virtual PP_Resource CreateMouseInputEvent( PP_Instance instance, PP_InputEvent_Type type, @@ -99,51 +99,51 @@ class ResourceCreationImpl : public ppapi::thunk::ResourceCreationAPI { PP_InputEvent_MouseButton mouse_button, const PP_Point* mouse_position, int32_t click_count, - const PP_Point* mouse_movement) OVERRIDE; + const PP_Point* mouse_movement) override; virtual PP_Resource CreateNetAddressFromIPv4Address( PP_Instance instance, - const PP_NetAddress_IPv4* ipv4_addr) OVERRIDE; + const PP_NetAddress_IPv4* ipv4_addr) override; virtual PP_Resource CreateNetAddressFromIPv6Address( PP_Instance instance, - const PP_NetAddress_IPv6* ipv6_addr) OVERRIDE; + const PP_NetAddress_IPv6* ipv6_addr) override; virtual PP_Resource CreateNetAddressFromNetAddressPrivate( PP_Instance instance, - const PP_NetAddress_Private& private_addr) OVERRIDE; - virtual PP_Resource CreateNetworkMonitor(PP_Instance instance) OVERRIDE; + const PP_NetAddress_Private& private_addr) override; + virtual PP_Resource CreateNetworkMonitor(PP_Instance instance) override; virtual PP_Resource CreatePlatformVerificationPrivate(PP_Instance instance) - OVERRIDE; + override; virtual PP_Resource CreateScrollbar(PP_Instance instance, - PP_Bool vertical) OVERRIDE; + PP_Bool vertical) override; virtual PP_Resource CreateOutputProtectionPrivate(PP_Instance instance) - OVERRIDE; - virtual PP_Resource CreateTalk(PP_Instance instance) OVERRIDE; + override; + virtual PP_Resource CreateTalk(PP_Instance instance) override; virtual PP_Resource CreateTCPServerSocketPrivate(PP_Instance instance) - OVERRIDE; - virtual PP_Resource CreateTCPSocket1_0(PP_Instance instance) OVERRIDE; - virtual PP_Resource CreateTCPSocket(PP_Instance instance) OVERRIDE; - virtual PP_Resource CreateTCPSocketPrivate(PP_Instance instance) OVERRIDE; + override; + virtual PP_Resource CreateTCPSocket1_0(PP_Instance instance) override; + virtual PP_Resource CreateTCPSocket(PP_Instance instance) override; + virtual PP_Resource CreateTCPSocketPrivate(PP_Instance instance) override; virtual PP_Resource CreateTouchInputEvent(PP_Instance instance, PP_InputEvent_Type type, PP_TimeTicks time_stamp, - uint32_t modifiers) OVERRIDE; - virtual PP_Resource CreateUDPSocket(PP_Instance instance) OVERRIDE; - virtual PP_Resource CreateUDPSocketPrivate(PP_Instance instance) OVERRIDE; - virtual PP_Resource CreateVideoCapture(PP_Instance instance) OVERRIDE; - virtual PP_Resource CreateVideoDecoder(PP_Instance instance) OVERRIDE; + uint32_t modifiers) override; + virtual PP_Resource CreateUDPSocket(PP_Instance instance) override; + virtual PP_Resource CreateUDPSocketPrivate(PP_Instance instance) override; + virtual PP_Resource CreateVideoCapture(PP_Instance instance) override; + virtual PP_Resource CreateVideoDecoder(PP_Instance instance) override; virtual PP_Resource CreateVideoDecoderDev(PP_Instance instance, PP_Resource graphics3d_id, PP_VideoDecoder_Profile profile) - OVERRIDE; - virtual PP_Resource CreateVideoDestination(PP_Instance instance) OVERRIDE; - virtual PP_Resource CreateVideoSource(PP_Instance instance) OVERRIDE; + override; + virtual PP_Resource CreateVideoDestination(PP_Instance instance) override; + virtual PP_Resource CreateVideoSource(PP_Instance instance) override; virtual PP_Resource CreateWheelInputEvent(PP_Instance instance, PP_TimeTicks time_stamp, uint32_t modifiers, const PP_FloatPoint* wheel_delta, const PP_FloatPoint* wheel_ticks, - PP_Bool scroll_by_page) OVERRIDE; + PP_Bool scroll_by_page) override; virtual PP_Resource CreateX509CertificatePrivate(PP_Instance instance) - OVERRIDE; + override; private: DISALLOW_COPY_AND_ASSIGN(ResourceCreationImpl); diff --git a/content/renderer/pepper/v8_var_converter_unittest.cc b/content/renderer/pepper/v8_var_converter_unittest.cc index 9492a43..d935658 100644 --- a/content/renderer/pepper/v8_var_converter_unittest.cc +++ b/content/renderer/pepper/v8_var_converter_unittest.cc @@ -51,21 +51,21 @@ void FromV8ValueComplete(const ScopedPPVar& scoped_var, class MockResourceConverter : public content::ResourceConverter { public: virtual ~MockResourceConverter() {} - virtual void Reset() OVERRIDE {} - virtual bool NeedsFlush() OVERRIDE { return false; } - virtual void Flush(const base::Callback<void(bool)>& callback) OVERRIDE { + virtual void Reset() override {} + virtual bool NeedsFlush() override { return false; } + virtual void Flush(const base::Callback<void(bool)>& callback) override { NOTREACHED(); } virtual bool FromV8Value(v8::Handle<v8::Object> val, v8::Handle<v8::Context> context, PP_Var* result, - bool* was_resource) OVERRIDE { + bool* was_resource) override { *was_resource = false; return true; } virtual bool ToV8Value(const PP_Var& var, v8::Handle<v8::Context> context, - v8::Handle<v8::Value>* result) OVERRIDE { + v8::Handle<v8::Value>* result) override { return false; } }; diff --git a/content/renderer/pepper/v8object_var.h b/content/renderer/pepper/v8object_var.h index ff564ed..f6cc206 100644 --- a/content/renderer/pepper/v8object_var.h +++ b/content/renderer/pepper/v8object_var.h @@ -33,8 +33,8 @@ class CONTENT_EXPORT V8ObjectVar : public Var { V8ObjectVar(PP_Instance instance, v8::Handle<v8::Object> v8_object); // Var overrides. - virtual V8ObjectVar* AsV8ObjectVar() OVERRIDE; - virtual PP_VarType GetType() const OVERRIDE; + virtual V8ObjectVar* AsV8ObjectVar() override; + virtual PP_VarType GetType() const override; // Returns the underlying v8 object corresponding to this V8ObjectVar. This // should only be used on the stack. diff --git a/content/renderer/pepper/video_decoder_shim.h b/content/renderer/pepper/video_decoder_shim.h index a9c4cce..35a6146 100644 --- a/content/renderer/pepper/video_decoder_shim.h +++ b/content/renderer/pepper/video_decoder_shim.h @@ -55,14 +55,14 @@ class VideoDecoderShim : public media::VideoDecodeAccelerator { // media::VideoDecodeAccelerator implementation. virtual bool Initialize( media::VideoCodecProfile profile, - media::VideoDecodeAccelerator::Client* client) OVERRIDE; - virtual void Decode(const media::BitstreamBuffer& bitstream_buffer) OVERRIDE; + media::VideoDecodeAccelerator::Client* client) override; + virtual void Decode(const media::BitstreamBuffer& bitstream_buffer) override; virtual void AssignPictureBuffers( - const std::vector<media::PictureBuffer>& buffers) OVERRIDE; - virtual void ReusePictureBuffer(int32 picture_buffer_id) OVERRIDE; - virtual void Flush() OVERRIDE; - virtual void Reset() OVERRIDE; - virtual void Destroy() OVERRIDE; + const std::vector<media::PictureBuffer>& buffers) override; + virtual void ReusePictureBuffer(int32 picture_buffer_id) override; + virtual void Flush() override; + virtual void Reset() override; + virtual void Destroy() override; private: enum State { diff --git a/content/renderer/push_messaging_dispatcher.h b/content/renderer/push_messaging_dispatcher.h index 70ec977..e0c5c99 100644 --- a/content/renderer/push_messaging_dispatcher.h +++ b/content/renderer/push_messaging_dispatcher.h @@ -35,7 +35,7 @@ class PushMessagingDispatcher : public RenderFrameObserver, private: // RenderFrame::Observer implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // WebPushClient implementation. virtual void registerPushMessaging( diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h index 0698885..30f5cd3 100644 --- a/content/renderer/render_frame_impl.h +++ b/content/renderer/render_frame_impl.h @@ -249,35 +249,35 @@ class CONTENT_EXPORT RenderFrameImpl #endif // IPC::Sender - virtual bool Send(IPC::Message* msg) OVERRIDE; + virtual bool Send(IPC::Message* msg) override; // IPC::Listener - virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& msg) override; // RenderFrame implementation: - virtual RenderView* GetRenderView() OVERRIDE; - virtual int GetRoutingID() OVERRIDE; - virtual blink::WebLocalFrame* GetWebFrame() OVERRIDE; - virtual WebPreferences& GetWebkitPreferences() OVERRIDE; + virtual RenderView* GetRenderView() override; + virtual int GetRoutingID() override; + virtual blink::WebLocalFrame* GetWebFrame() override; + virtual WebPreferences& GetWebkitPreferences() override; virtual int ShowContextMenu(ContextMenuClient* client, - const ContextMenuParams& params) OVERRIDE; - virtual void CancelContextMenu(int request_id) OVERRIDE; - virtual blink::WebNode GetContextMenuNode() const OVERRIDE; + const ContextMenuParams& params) override; + virtual void CancelContextMenu(int request_id) override; + virtual blink::WebNode GetContextMenuNode() const override; virtual blink::WebPlugin* CreatePlugin( blink::WebFrame* frame, const WebPluginInfo& info, - const blink::WebPluginParams& params) OVERRIDE; + const blink::WebPluginParams& params) override; virtual void LoadURLExternally(blink::WebLocalFrame* frame, const blink::WebURLRequest& request, - blink::WebNavigationPolicy policy) OVERRIDE; - virtual void ExecuteJavaScript(const base::string16& javascript) OVERRIDE; - virtual bool IsHidden() OVERRIDE; - virtual ServiceRegistry* GetServiceRegistry() OVERRIDE; - virtual bool IsFTPDirectoryListing() OVERRIDE; - virtual void AttachGuest(int element_instance_id) OVERRIDE; + blink::WebNavigationPolicy policy) override; + virtual void ExecuteJavaScript(const base::string16& javascript) override; + virtual bool IsHidden() override; + virtual ServiceRegistry* GetServiceRegistry() override; + virtual bool IsFTPDirectoryListing() override; + virtual void AttachGuest(int element_instance_id) override; virtual void SetSelectedText(const base::string16& selection_text, size_t offset, - const gfx::Range& range) OVERRIDE; + const gfx::Range& range) override; // blink::WebFrameClient implementation: virtual blink::WebPlugin* createPlugin(blink::WebLocalFrame* frame, @@ -458,9 +458,9 @@ class CONTENT_EXPORT RenderFrameImpl virtual void didChangeManifest(blink::WebLocalFrame*); // WebMediaPlayerDelegate implementation: - virtual void DidPlay(blink::WebMediaPlayer* player) OVERRIDE; - virtual void DidPause(blink::WebMediaPlayer* player) OVERRIDE; - virtual void PlayerGone(blink::WebMediaPlayer* player) OVERRIDE; + virtual void DidPlay(blink::WebMediaPlayer* player) override; + virtual void DidPause(blink::WebMediaPlayer* player) override; + virtual void PlayerGone(blink::WebMediaPlayer* player) override; // TODO(nasko): Make all tests in RenderViewImplTest friends and then move // this back to private member. diff --git a/content/renderer/render_frame_proxy.h b/content/renderer/render_frame_proxy.h index 02aadc3..61ee652 100644 --- a/content/renderer/render_frame_proxy.h +++ b/content/renderer/render_frame_proxy.h @@ -83,7 +83,7 @@ class CONTENT_EXPORT RenderFrameProxy virtual ~RenderFrameProxy(); // IPC::Sender - virtual bool Send(IPC::Message* msg) OVERRIDE; + virtual bool Send(IPC::Message* msg) override; // Out-of-process child frames receive a signal from RenderWidgetCompositor // when a compositor frame has committed. @@ -111,7 +111,7 @@ class CONTENT_EXPORT RenderFrameProxy void Init(blink::WebRemoteFrame* frame, RenderViewImpl* render_view); // IPC::Listener - virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& msg) override; // IPC handlers void OnDeleteProxy(); diff --git a/content/renderer/render_process_impl.h b/content/renderer/render_process_impl.h index 97c1244..72555ef 100644 --- a/content/renderer/render_process_impl.h +++ b/content/renderer/render_process_impl.h @@ -18,8 +18,8 @@ class RenderProcessImpl : public RenderProcess { virtual ~RenderProcessImpl(); // RenderProcess implementation. - virtual void AddBindings(int bindings) OVERRIDE; - virtual int GetEnabledBindings() const OVERRIDE; + virtual void AddBindings(int bindings) override; + virtual int GetEnabledBindings() const override; private: // Bitwise-ORed set of extra bindings that have been enabled anywhere in this diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 88a572f..414b01a 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -198,7 +198,7 @@ class RenderViewZoomer : public RenderViewVisitor { zoom_level_(zoom_level) { } - virtual bool Visit(RenderView* render_view) OVERRIDE { + virtual bool Visit(RenderView* render_view) override { WebView* webview = render_view->GetWebView(); WebDocument document = webview->mainFrame()->document(); @@ -286,7 +286,7 @@ class RenderFrameSetupImpl : public mojo::InterfaceImpl<RenderFrameSetup> { virtual void GetServiceProviderForFrame( int32_t frame_routing_id, - mojo::InterfaceRequest<mojo::ServiceProvider> request) OVERRIDE { + mojo::InterfaceRequest<mojo::ServiceProvider> request) override { // TODO(morrita): This is for investigating http://crbug.com/415059 and // should be removed once it is fixed. CHECK_LT(routing_id_highmark_, frame_routing_id); @@ -343,10 +343,10 @@ class MemoryObserver : public base::MessageLoop::TaskObserver { MemoryObserver() {} virtual ~MemoryObserver() {} - virtual void WillProcessTask(const base::PendingTask& pending_task) OVERRIDE { + virtual void WillProcessTask(const base::PendingTask& pending_task) override { } - virtual void DidProcessTask(const base::PendingTask& pending_task) OVERRIDE { + virtual void DidProcessTask(const base::PendingTask& pending_task) override { LOCAL_HISTOGRAM_MEMORY_KB("Memory.RendererUsed", GetMemoryUsageKB()); } diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h index b1ed5ce..cb27dff 100644 --- a/content/renderer/render_thread_impl.h +++ b/content/renderer/render_thread_impl.h @@ -121,7 +121,7 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread, // Constructor that's used when running in single process mode. explicit RenderThreadImpl(const std::string& channel_name); virtual ~RenderThreadImpl(); - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // When initializing WebKit, ensure that any schemes needed for the content // module are registered properly. Static to allow sharing with tests. @@ -132,42 +132,42 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread, static void NotifyTimezoneChange(); // RenderThread implementation: - virtual bool Send(IPC::Message* msg) OVERRIDE; - virtual base::MessageLoop* GetMessageLoop() OVERRIDE; - virtual IPC::SyncChannel* GetChannel() OVERRIDE; - virtual std::string GetLocale() OVERRIDE; - virtual IPC::SyncMessageFilter* GetSyncMessageFilter() OVERRIDE; + virtual bool Send(IPC::Message* msg) override; + virtual base::MessageLoop* GetMessageLoop() override; + virtual IPC::SyncChannel* GetChannel() override; + virtual std::string GetLocale() override; + virtual IPC::SyncMessageFilter* GetSyncMessageFilter() override; virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() - OVERRIDE; - virtual void AddRoute(int32 routing_id, IPC::Listener* listener) OVERRIDE; - virtual void RemoveRoute(int32 routing_id) OVERRIDE; - virtual int GenerateRoutingID() OVERRIDE; - virtual void AddFilter(IPC::MessageFilter* filter) OVERRIDE; - virtual void RemoveFilter(IPC::MessageFilter* filter) OVERRIDE; - virtual void AddObserver(RenderProcessObserver* observer) OVERRIDE; - virtual void RemoveObserver(RenderProcessObserver* observer) OVERRIDE; + override; + virtual void AddRoute(int32 routing_id, IPC::Listener* listener) override; + virtual void RemoveRoute(int32 routing_id) override; + virtual int GenerateRoutingID() override; + virtual void AddFilter(IPC::MessageFilter* filter) override; + virtual void RemoveFilter(IPC::MessageFilter* filter) override; + virtual void AddObserver(RenderProcessObserver* observer) override; + virtual void RemoveObserver(RenderProcessObserver* observer) override; virtual void SetResourceDispatcherDelegate( - ResourceDispatcherDelegate* delegate) OVERRIDE; - virtual void EnsureWebKitInitialized() OVERRIDE; - virtual void RecordAction(const base::UserMetricsAction& action) OVERRIDE; - virtual void RecordComputedAction(const std::string& action) OVERRIDE; + ResourceDispatcherDelegate* delegate) override; + virtual void EnsureWebKitInitialized() override; + virtual void RecordAction(const base::UserMetricsAction& action) override; + virtual void RecordComputedAction(const std::string& action) override; virtual scoped_ptr<base::SharedMemory> HostAllocateSharedMemoryBuffer( - size_t buffer_size) OVERRIDE; - virtual void RegisterExtension(v8::Extension* extension) OVERRIDE; - virtual void ScheduleIdleHandler(int64 initial_delay_ms) OVERRIDE; - virtual void IdleHandler() OVERRIDE; - virtual int64 GetIdleNotificationDelayInMs() const OVERRIDE; + size_t buffer_size) override; + virtual void RegisterExtension(v8::Extension* extension) override; + virtual void ScheduleIdleHandler(int64 initial_delay_ms) override; + virtual void IdleHandler() override; + virtual int64 GetIdleNotificationDelayInMs() const override; virtual void SetIdleNotificationDelayInMs( - int64 idle_notification_delay_in_ms) OVERRIDE; - virtual void UpdateHistograms(int sequence_number) OVERRIDE; - virtual int PostTaskToAllWebWorkers(const base::Closure& closure) OVERRIDE; - virtual bool ResolveProxy(const GURL& url, std::string* proxy_list) OVERRIDE; - virtual base::WaitableEvent* GetShutdownEvent() OVERRIDE; + int64 idle_notification_delay_in_ms) override; + virtual void UpdateHistograms(int sequence_number) override; + virtual int PostTaskToAllWebWorkers(const base::Closure& closure) override; + virtual bool ResolveProxy(const GURL& url, std::string* proxy_list) override; + virtual base::WaitableEvent* GetShutdownEvent() override; #if defined(OS_WIN) - virtual void PreCacheFont(const LOGFONT& log_font) OVERRIDE; - virtual void ReleaseCachedFonts() OVERRIDE; + virtual void PreCacheFont(const LOGFONT& log_font) override; + virtual void ReleaseCachedFonts() override; #endif - virtual ServiceRegistry* GetServiceRegistry() OVERRIDE; + virtual ServiceRegistry* GetServiceRegistry() override; // Synchronously establish a channel to the GPU plugin if not previously // established or if it has been lost (for example if the GPU plugin crashed). @@ -401,23 +401,23 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread, private: // ChildThread - virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE; + virtual bool OnControlMessageReceived(const IPC::Message& msg) override; // GpuChannelHostFactory implementation: - virtual bool IsMainThread() OVERRIDE; - virtual base::MessageLoop* GetMainLoop() OVERRIDE; - virtual scoped_refptr<base::MessageLoopProxy> GetIOLoopProxy() OVERRIDE; + virtual bool IsMainThread() override; + virtual base::MessageLoop* GetMainLoop() override; + virtual scoped_refptr<base::MessageLoopProxy> GetIOLoopProxy() override; virtual scoped_ptr<base::SharedMemory> AllocateSharedMemory( - size_t size) OVERRIDE; + size_t size) override; virtual CreateCommandBufferResult CreateViewCommandBuffer( int32 surface_id, const GPUCreateCommandBufferConfig& init_params, - int32 route_id) OVERRIDE; + int32 route_id) override; virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer( size_t width, size_t height, unsigned internalformat, - unsigned usage) OVERRIDE; + unsigned usage) override; void Init(); diff --git a/content/renderer/render_thread_impl_browsertest.cc b/content/renderer/render_thread_impl_browsertest.cc index 099da86..df4f986 100644 --- a/content/renderer/render_thread_impl_browsertest.cc +++ b/content/renderer/render_thread_impl_browsertest.cc @@ -24,7 +24,7 @@ class RenderThreadImplBrowserTest : public testing::Test { class DummyListener : public IPC::Listener { public: - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) override { return true; } }; diff --git a/content/renderer/render_thread_impl_unittest.cc b/content/renderer/render_thread_impl_unittest.cc index 89cafc1..262b21a 100644 --- a/content/renderer/render_thread_impl_unittest.cc +++ b/content/renderer/render_thread_impl_unittest.cc @@ -16,7 +16,7 @@ class RenderThreadImplUnittest : public testing::Test { kNormalHistogram_("Histogram2") {} virtual ~RenderThreadImplUnittest() {} protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { histogram_customizer_.custom_histograms_.clear(); histogram_customizer_.custom_histograms_.insert(kCustomizableHistogram_); } diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index bbf0454..15c85be 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc @@ -116,19 +116,19 @@ int ConvertMockKeyboardModifier(MockKeyboard::Modifiers modifiers) { class WebUITestWebUIControllerFactory : public WebUIControllerFactory { public: virtual WebUIController* CreateWebUIControllerForURL( - WebUI* web_ui, const GURL& url) const OVERRIDE { + WebUI* web_ui, const GURL& url) const override { return NULL; } virtual WebUI::TypeID GetWebUIType(BrowserContext* browser_context, - const GURL& url) const OVERRIDE { + const GURL& url) const override { return WebUI::kNoWebUI; } virtual bool UseWebUIForURL(BrowserContext* browser_context, - const GURL& url) const OVERRIDE { + const GURL& url) const override { return HasWebUIScheme(url); } virtual bool UseWebUIBindingsForURL(BrowserContext* browser_context, - const GURL& url) const OVERRIDE { + const GURL& url) const override { return HasWebUIScheme(url); } }; @@ -144,7 +144,7 @@ class RenderViewImplTest : public RenderViewTest { virtual ~RenderViewImplTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { RenderViewTest::SetUp(); // Enable Blink's experimental and test only features so that test code // does not have to bother enabling each feature. @@ -2169,7 +2169,7 @@ TEST_F(RenderViewImplTest, MessageOrderInDidChangeSelection) { class SuppressErrorPageTest : public RenderViewTest { public: - virtual ContentRendererClient* CreateContentRendererClient() OVERRIDE { + virtual ContentRendererClient* CreateContentRendererClient() override { return new TestContentRendererClient; } @@ -2185,7 +2185,7 @@ class SuppressErrorPageTest : public RenderViewTest { class TestContentRendererClient : public ContentRendererClient { public: virtual bool ShouldSuppressErrorPage(RenderFrame* render_frame, - const GURL& url) OVERRIDE { + const GURL& url) override { return url == GURL("http://example.com/suppress"); } @@ -2195,7 +2195,7 @@ class SuppressErrorPageTest : public RenderViewTest { const blink::WebURLRequest& failed_request, const blink::WebURLError& error, std::string* error_html, - base::string16* error_description) OVERRIDE { + base::string16* error_description) override { if (error_html) *error_html = "A suffusion of yellow."; } diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 37b3271..f849081 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -461,19 +461,19 @@ class WebWidgetLockTarget : public MouseLockDispatcher::LockTarget { explicit WebWidgetLockTarget(blink::WebWidget* webwidget) : webwidget_(webwidget) {} - virtual void OnLockMouseACK(bool succeeded) OVERRIDE { + virtual void OnLockMouseACK(bool succeeded) override { if (succeeded) webwidget_->didAcquirePointerLock(); else webwidget_->didNotAcquirePointerLock(); } - virtual void OnMouseLockLost() OVERRIDE { + virtual void OnMouseLockLost() override { webwidget_->didLosePointerLock(); } virtual bool HandleMouseLockedInputEvent( - const blink::WebMouseEvent &event) OVERRIDE { + const blink::WebMouseEvent &event) override { // The WebWidget handles mouse lock in WebKit's handleInputEvent(). return false; } diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h index 0ee3665..1037aed 100644 --- a/content/renderer/render_view_impl.h +++ b/content/renderer/render_view_impl.h @@ -333,7 +333,7 @@ class CONTENT_EXPORT RenderViewImpl // Change the device ICC color profile while running a layout test. void SetDeviceColorProfileForTesting(const std::vector<char>& color_profile); - virtual void ResetDeviceColorProfileForTesting() OVERRIDE; + virtual void ResetDeviceColorProfileForTesting() override; // Used to force the size of a window when running layout tests. void ForceResizeForTesting(const gfx::Size& new_size); @@ -347,7 +347,7 @@ class CONTENT_EXPORT RenderViewImpl // IPC::Listener implementation ---------------------------------------------- - virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& msg) override; // blink::WebWidgetClient implementation ------------------------------------ @@ -362,8 +362,8 @@ class CONTENT_EXPORT RenderViewImpl virtual void requestPointerUnlock(); virtual bool isPointerLocked(); virtual void didHandleGestureEvent(const blink::WebGestureEvent& event, - bool event_cancelled) OVERRIDE; - virtual void initializeLayerTreeView() OVERRIDE; + bool event_cancelled) override; + virtual void initializeLayerTreeView() override; // blink::WebViewClient implementation -------------------------------------- @@ -393,10 +393,10 @@ class CONTENT_EXPORT RenderViewImpl const blink::WebString& main_text, blink::WebTextDirection main_text_hint, const blink::WebString& sub_text, - blink::WebTextDirection hint) OVERRIDE; - virtual void hideValidationMessage() OVERRIDE; + blink::WebTextDirection hint) override; + virtual void hideValidationMessage() override; virtual void moveValidationMessage( - const blink::WebRect& anchor_in_root_view) OVERRIDE; + const blink::WebRect& anchor_in_root_view) override; virtual void setStatusText(const blink::WebString& text); virtual void setMouseOverURL(const blink::WebURL& url); virtual void setKeyboardFocusURL(const blink::WebURL& url); @@ -452,37 +452,37 @@ class CONTENT_EXPORT RenderViewImpl virtual void didSerializeDataForFrame( const blink::WebURL& frame_url, const blink::WebCString& data, - PageSerializationStatus status) OVERRIDE; + PageSerializationStatus status) override; // RenderView implementation ------------------------------------------------- - virtual bool Send(IPC::Message* message) OVERRIDE; - virtual RenderFrameImpl* GetMainRenderFrame() OVERRIDE; - virtual int GetRoutingID() const OVERRIDE; - virtual gfx::Size GetSize() const OVERRIDE; - virtual WebPreferences& GetWebkitPreferences() OVERRIDE; - virtual void SetWebkitPreferences(const WebPreferences& preferences) OVERRIDE; - virtual blink::WebView* GetWebView() OVERRIDE; - virtual blink::WebElement GetFocusedElement() const OVERRIDE; - virtual bool IsEditableNode(const blink::WebNode& node) const OVERRIDE; + virtual bool Send(IPC::Message* message) override; + virtual RenderFrameImpl* GetMainRenderFrame() override; + virtual int GetRoutingID() const override; + virtual gfx::Size GetSize() const override; + virtual WebPreferences& GetWebkitPreferences() override; + virtual void SetWebkitPreferences(const WebPreferences& preferences) override; + virtual blink::WebView* GetWebView() override; + virtual blink::WebElement GetFocusedElement() const override; + virtual bool IsEditableNode(const blink::WebNode& node) const override; virtual bool NodeContainsPoint(const blink::WebNode& node, - const gfx::Point& point) const OVERRIDE; - virtual bool ShouldDisplayScrollbars(int width, int height) const OVERRIDE; - virtual int GetEnabledBindings() const OVERRIDE; - virtual bool GetContentStateImmediately() const OVERRIDE; - virtual blink::WebPageVisibilityState GetVisibilityState() const OVERRIDE; - virtual void DidStartLoading() OVERRIDE; - virtual void DidStopLoading() OVERRIDE; - virtual void Repaint(const gfx::Size& size) OVERRIDE; + const gfx::Point& point) const override; + virtual bool ShouldDisplayScrollbars(int width, int height) const override; + virtual int GetEnabledBindings() const override; + virtual bool GetContentStateImmediately() const override; + virtual blink::WebPageVisibilityState GetVisibilityState() const override; + virtual void DidStartLoading() override; + virtual void DidStopLoading() override; + virtual void Repaint(const gfx::Size& size) override; virtual void SetEditCommandForNextKeyEvent(const std::string& name, - const std::string& value) OVERRIDE; - virtual void ClearEditCommands() OVERRIDE; - virtual SSLStatus GetSSLStatusOfFrame(blink::WebFrame* frame) const OVERRIDE; - virtual const std::string& GetAcceptLanguages() const OVERRIDE; + const std::string& value) override; + virtual void ClearEditCommands() override; + virtual SSLStatus GetSSLStatusOfFrame(blink::WebFrame* frame) const override; + virtual const std::string& GetAcceptLanguages() const override; #if defined(OS_ANDROID) virtual void UpdateTopControlsState(TopControlsState constraints, TopControlsState current, - bool animate) OVERRIDE; + bool animate) override; #endif bool uses_temporary_zoom_level() const { return uses_temporary_zoom_level_; } @@ -497,50 +497,50 @@ class CONTENT_EXPORT RenderViewImpl protected: // RenderWidget overrides: - virtual void OnClose() OVERRIDE; - virtual void Close() OVERRIDE; - virtual void OnResize(const ViewMsg_Resize_Params& params) OVERRIDE; - virtual void DidInitiatePaint() OVERRIDE; - virtual void DidFlushPaint() OVERRIDE; - virtual gfx::Vector2d GetScrollOffset() OVERRIDE; - virtual void DidHandleKeyEvent() OVERRIDE; + virtual void OnClose() override; + virtual void Close() override; + virtual void OnResize(const ViewMsg_Resize_Params& params) override; + virtual void DidInitiatePaint() override; + virtual void DidFlushPaint() override; + virtual gfx::Vector2d GetScrollOffset() override; + virtual void DidHandleKeyEvent() override; virtual bool WillHandleMouseEvent( - const blink::WebMouseEvent& event) OVERRIDE; + const blink::WebMouseEvent& event) override; virtual bool WillHandleGestureEvent( - const blink::WebGestureEvent& event) OVERRIDE; - virtual void DidHandleMouseEvent(const blink::WebMouseEvent& event) OVERRIDE; - virtual void DidHandleTouchEvent(const blink::WebTouchEvent& event) OVERRIDE; - virtual bool HasTouchEventHandlersAt(const gfx::Point& point) const OVERRIDE; - virtual void OnSetFocus(bool enable) OVERRIDE; - virtual void OnWasHidden() OVERRIDE; + const blink::WebGestureEvent& event) override; + virtual void DidHandleMouseEvent(const blink::WebMouseEvent& event) override; + virtual void DidHandleTouchEvent(const blink::WebTouchEvent& event) override; + virtual bool HasTouchEventHandlersAt(const gfx::Point& point) const override; + virtual void OnSetFocus(bool enable) override; + virtual void OnWasHidden() override; virtual void OnWasShown(bool needs_repainting, - const ui::LatencyInfo& latency_info) OVERRIDE; - virtual GURL GetURLForGraphicsContext3D() OVERRIDE; + const ui::LatencyInfo& latency_info) override; + virtual GURL GetURLForGraphicsContext3D() override; virtual void OnImeSetComposition( const base::string16& text, const std::vector<blink::WebCompositionUnderline>& underlines, int selection_start, - int selection_end) OVERRIDE; + int selection_end) override; virtual void OnImeConfirmComposition(const base::string16& text, const gfx::Range& replacement_range, - bool keep_selection) OVERRIDE; - virtual void SetDeviceScaleFactor(float device_scale_factor) OVERRIDE; + bool keep_selection) override; + virtual void SetDeviceScaleFactor(float device_scale_factor) override; virtual bool SetDeviceColorProfile( - const std::vector<char>& color_profile) OVERRIDE; - virtual void OnOrientationChange() OVERRIDE; - virtual ui::TextInputType GetTextInputType() OVERRIDE; - virtual void GetSelectionBounds(gfx::Rect* start, gfx::Rect* end) OVERRIDE; + const std::vector<char>& color_profile) override; + virtual void OnOrientationChange() override; + virtual ui::TextInputType GetTextInputType() override; + virtual void GetSelectionBounds(gfx::Rect* start, gfx::Rect* end) override; #if defined(OS_MACOSX) || defined(USE_AURA) virtual void GetCompositionCharacterBounds( - std::vector<gfx::Rect>* character_bounds) OVERRIDE; - virtual void GetCompositionRange(gfx::Range* range) OVERRIDE; + std::vector<gfx::Rect>* character_bounds) override; + virtual void GetCompositionRange(gfx::Range* range) override; #endif - virtual bool CanComposeInline() OVERRIDE; - virtual void DidCommitCompositorFrame() OVERRIDE; - virtual void InstrumentWillBeginFrame(int frame_id) OVERRIDE; - virtual void InstrumentDidBeginFrame() OVERRIDE; - virtual void InstrumentDidCancelFrame() OVERRIDE; - virtual void InstrumentWillComposite() OVERRIDE; + virtual bool CanComposeInline() override; + virtual void DidCommitCompositorFrame() override; + virtual void InstrumentWillBeginFrame(int frame_id) override; + virtual void InstrumentDidBeginFrame() override; + virtual void InstrumentDidCancelFrame() override; + virtual void InstrumentWillComposite() override; protected: explicit RenderViewImpl(RenderViewImplParams* params); @@ -549,7 +549,7 @@ class CONTENT_EXPORT RenderViewImpl virtual void SetScreenMetricsEmulationParameters( float device_scale_factor, const gfx::Point& root_layer_offset, - float root_layer_scale) OVERRIDE; + float root_layer_scale) override; // Do not delete directly. This class is reference counted. virtual ~RenderViewImpl(); diff --git a/content/renderer/render_view_mouse_lock_dispatcher.h b/content/renderer/render_view_mouse_lock_dispatcher.h index 4e16c57..61c20c8 100644 --- a/content/renderer/render_view_mouse_lock_dispatcher.h +++ b/content/renderer/render_view_mouse_lock_dispatcher.h @@ -22,11 +22,11 @@ class RenderViewMouseLockDispatcher : public MouseLockDispatcher, private: // MouseLockDispatcher implementation. - virtual void SendLockMouseRequest(bool unlocked_by_target) OVERRIDE; - virtual void SendUnlockMouseRequest() OVERRIDE; + virtual void SendLockMouseRequest(bool unlocked_by_target) override; + virtual void SendUnlockMouseRequest() override; // RenderView::Observer implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; void OnLockMouseACK(bool succeeded); diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h index c2b22ad..7a7663c 100644 --- a/content/renderer/render_widget.h +++ b/content/renderer/render_widget.h @@ -135,10 +135,10 @@ class CONTENT_EXPORT RenderWidget #endif // defined(VIDEO_HOLE) // IPC::Listener - virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& msg) override; // IPC::Sender - virtual bool Send(IPC::Message* msg) OVERRIDE; + virtual bool Send(IPC::Message* msg) override; // blink::WebWidgetClient virtual void willBeginCompositorFrame(); diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc index 572a261..d78498a 100644 --- a/content/renderer/render_widget_fullscreen_pepper.cc +++ b/content/renderer/render_widget_fullscreen_pepper.cc @@ -54,8 +54,8 @@ class FullscreenMouseLockDispatcher : public MouseLockDispatcher { private: // MouseLockDispatcher implementation. - virtual void SendLockMouseRequest(bool unlocked_by_target) OVERRIDE; - virtual void SendUnlockMouseRequest() OVERRIDE; + virtual void SendLockMouseRequest(bool unlocked_by_target) override; + virtual void SendUnlockMouseRequest() override; RenderWidgetFullscreenPepper* widget_; diff --git a/content/renderer/render_widget_fullscreen_pepper.h b/content/renderer/render_widget_fullscreen_pepper.h index 5fdb0e0..ccf68cf 100644 --- a/content/renderer/render_widget_fullscreen_pepper.h +++ b/content/renderer/render_widget_fullscreen_pepper.h @@ -31,16 +31,16 @@ class RenderWidgetFullscreenPepper : public RenderWidgetFullscreen, const blink::WebScreenInfo& screen_info); // pepper::FullscreenContainer API. - virtual void Invalidate() OVERRIDE; - virtual void InvalidateRect(const blink::WebRect& rect) OVERRIDE; - virtual void ScrollRect(int dx, int dy, const blink::WebRect& rect) OVERRIDE; - virtual void Destroy() OVERRIDE; - virtual void DidChangeCursor(const blink::WebCursorInfo& cursor) OVERRIDE; - virtual void SetLayer(blink::WebLayer* layer) OVERRIDE; + virtual void Invalidate() override; + virtual void InvalidateRect(const blink::WebRect& rect) override; + virtual void ScrollRect(int dx, int dy, const blink::WebRect& rect) override; + virtual void Destroy() override; + virtual void DidChangeCursor(const blink::WebCursorInfo& cursor) override; + virtual void SetLayer(blink::WebLayer* layer) override; // IPC::Listener implementation. This overrides the implementation // in RenderWidgetFullscreen. - virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& msg) override; // Could be NULL when this widget is closing. PepperPluginInstanceImpl* plugin() const { return plugin_; } @@ -56,17 +56,17 @@ class RenderWidgetFullscreenPepper : public RenderWidgetFullscreen, virtual ~RenderWidgetFullscreenPepper(); // RenderWidget API. - virtual void DidInitiatePaint() OVERRIDE; - virtual void DidFlushPaint() OVERRIDE; - virtual void Close() OVERRIDE; - virtual void OnResize(const ViewMsg_Resize_Params& params) OVERRIDE; + virtual void DidInitiatePaint() override; + virtual void DidFlushPaint() override; + virtual void Close() override; + virtual void OnResize(const ViewMsg_Resize_Params& params) override; // RenderWidgetFullscreen API. - virtual blink::WebWidget* CreateWebWidget() OVERRIDE; + virtual blink::WebWidget* CreateWebWidget() override; // RenderWidget overrides. - virtual GURL GetURLForGraphicsContext3D() OVERRIDE; - virtual void SetDeviceScaleFactor(float device_scale_factor) OVERRIDE; + virtual GURL GetURLForGraphicsContext3D() override; + virtual void SetDeviceScaleFactor(float device_scale_factor) override; private: // URL that is responsible for this widget, passed to ggl::CreateViewContext. diff --git a/content/renderer/render_widget_unittest.cc b/content/renderer/render_widget_unittest.cc index f8f145d..e37096d 100644 --- a/content/renderer/render_widget_unittest.cc +++ b/content/renderer/render_widget_unittest.cc @@ -52,7 +52,7 @@ class TouchableRenderWidget : public RenderWidget { virtual ~TouchableRenderWidget() {} // Overridden from RenderWidget: - virtual bool HasTouchEventHandlersAt(const gfx::Point& point) const OVERRIDE { + virtual bool HasTouchEventHandlersAt(const gfx::Point& point) const override { for (std::vector<gfx::Rect>::const_iterator iter = rects_.begin(); iter != rects_.end(); ++iter) { if ((*iter).Contains(point)) @@ -61,7 +61,7 @@ class TouchableRenderWidget : public RenderWidget { return false; } - virtual bool Send(IPC::Message* msg) OVERRIDE { + virtual bool Send(IPC::Message* msg) override { sink_.OnMessageReceived(*msg); delete msg; return true; diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc index 3a0ccc3..242a595 100644 --- a/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc @@ -167,7 +167,7 @@ class RendererBlinkPlatformImpl::MimeRegistry const blink::WebString& codecs); virtual bool supportsEncryptedMediaMIMEType(const WebString& key_system, const WebString& mime_type, - const WebString& codecs) OVERRIDE; + const WebString& codecs) override; virtual blink::WebString mimeTypeForExtension( const blink::WebString& file_extension); virtual blink::WebString mimeTypeFromFile( diff --git a/content/renderer/renderer_clipboard_client.cc b/content/renderer/renderer_clipboard_client.cc index 81f5cae..4b36e22 100644 --- a/content/renderer/renderer_clipboard_client.cc +++ b/content/renderer/renderer_clipboard_client.cc @@ -26,8 +26,8 @@ class RendererClipboardWriteContext : public ClipboardClient::WriteContext { virtual ~RendererClipboardWriteContext(); virtual void WriteBitmapFromPixels(ui::Clipboard::ObjectMap* objects, const void* pixels, - const gfx::Size& size) OVERRIDE; - virtual void Flush(const ui::Clipboard::ObjectMap& objects) OVERRIDE; + const gfx::Size& size) override; + virtual void Flush(const ui::Clipboard::ObjectMap& objects) override; private: scoped_ptr<base::SharedMemory> shared_buf_; diff --git a/content/renderer/renderer_clipboard_client.h b/content/renderer/renderer_clipboard_client.h index ebf46ad..5920c78 100644 --- a/content/renderer/renderer_clipboard_client.h +++ b/content/renderer/renderer_clipboard_client.h @@ -16,27 +16,27 @@ class RendererClipboardClient : public ClipboardClient { RendererClipboardClient(); virtual ~RendererClipboardClient(); - virtual ui::Clipboard* GetClipboard() OVERRIDE; - virtual uint64 GetSequenceNumber(ui::ClipboardType type) OVERRIDE; + virtual ui::Clipboard* GetClipboard() override; + virtual uint64 GetSequenceNumber(ui::ClipboardType type) override; virtual bool IsFormatAvailable(ClipboardFormat format, - ui::ClipboardType type) OVERRIDE; - virtual void Clear(ui::ClipboardType type) OVERRIDE; + ui::ClipboardType type) override; + virtual void Clear(ui::ClipboardType type) override; virtual void ReadAvailableTypes(ui::ClipboardType type, std::vector<base::string16>* types, - bool* contains_filenames) OVERRIDE; + bool* contains_filenames) override; virtual void ReadText(ui::ClipboardType type, - base::string16* result) OVERRIDE; + base::string16* result) override; virtual void ReadHTML(ui::ClipboardType type, base::string16* markup, GURL* url, uint32* fragment_start, - uint32* fragment_end) OVERRIDE; - virtual void ReadRTF(ui::ClipboardType type, std::string* result) OVERRIDE; - virtual void ReadImage(ui::ClipboardType type, std::string* data) OVERRIDE; + uint32* fragment_end) override; + virtual void ReadRTF(ui::ClipboardType type, std::string* result) override; + virtual void ReadImage(ui::ClipboardType type, std::string* data) override; virtual void ReadCustomData(ui::ClipboardType clipboard_type, const base::string16& type, - base::string16* data) OVERRIDE; - virtual WriteContext* CreateWriteContext() OVERRIDE; + base::string16* data) override; + virtual WriteContext* CreateWriteContext() override; }; } // namespace content diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc index 09e0d30..75c33a6 100644 --- a/content/renderer/renderer_main.cc +++ b/content/renderer/renderer_main.cc @@ -81,11 +81,11 @@ class RendererMessageLoopObserver : public base::MessageLoop::TaskObserver { 1, 3600000, 50, base::Histogram::kUmaTargetedHistogramFlag)) {} virtual ~RendererMessageLoopObserver() {} - virtual void WillProcessTask(const base::PendingTask& pending_task) OVERRIDE { + virtual void WillProcessTask(const base::PendingTask& pending_task) override { begin_process_message_ = base::TimeTicks::Now(); } - virtual void DidProcessTask(const base::PendingTask& pending_task) OVERRIDE { + virtual void DidProcessTask(const base::PendingTask& pending_task) override { if (!begin_process_message_.is_null()) process_times_->AddTime(base::TimeTicks::Now() - begin_process_message_); } diff --git a/content/renderer/renderer_webapplicationcachehost_impl.h b/content/renderer/renderer_webapplicationcachehost_impl.h index a752c08..9e13a48 100644 --- a/content/renderer/renderer_webapplicationcachehost_impl.h +++ b/content/renderer/renderer_webapplicationcachehost_impl.h @@ -19,9 +19,9 @@ class RendererWebApplicationCacheHostImpl : public WebApplicationCacheHostImpl { // WebApplicationCacheHostImpl: virtual void OnLogMessage(AppCacheLogLevel log_level, - const std::string& message) OVERRIDE; - virtual void OnContentBlocked(const GURL& manifest_url) OVERRIDE; - virtual void OnCacheSelected(const AppCacheInfo& info) OVERRIDE; + const std::string& message) override; + virtual void OnContentBlocked(const GURL& manifest_url) override; + virtual void OnCacheSelected(const AppCacheInfo& info) override; private: RenderViewImpl* GetRenderView(); diff --git a/content/renderer/renderer_webcolorchooser_impl.h b/content/renderer/renderer_webcolorchooser_impl.h index 99bd401..4952630 100644 --- a/content/renderer/renderer_webcolorchooser_impl.h +++ b/content/renderer/renderer_webcolorchooser_impl.h @@ -41,8 +41,8 @@ class RendererWebColorChooserImpl : public blink::WebColorChooser, // Don't destroy the RendererWebColorChooserImpl when the RenderFrame goes // away. RendererWebColorChooserImpl is owned by // blink::ColorChooserUIController. - virtual void OnDestruct() OVERRIDE {} - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual void OnDestruct() override {} + virtual bool OnMessageReceived(const IPC::Message& message) override; void OnDidChooseColorResponse(int color_chooser_id, SkColor color); void OnDidEndColorChooser(int color_chooser_id); diff --git a/content/renderer/resource_fetcher_browsertest.cc b/content/renderer/resource_fetcher_browsertest.cc index d83e9f9..a5f3800 100644 --- a/content/renderer/resource_fetcher_browsertest.cc +++ b/content/renderer/resource_fetcher_browsertest.cc @@ -115,7 +115,7 @@ class EvilFetcherDelegate : public FetcherDelegate { } virtual void OnURLFetchComplete(const WebURLResponse& response, - const std::string& data) OVERRIDE { + const std::string& data) override { FetcherDelegate::OnURLFetchComplete(response, data); // Destroy the ResourceFetcher here. We are testing that upon returning @@ -131,7 +131,7 @@ class EvilFetcherDelegate : public FetcherDelegate { class ResourceFetcherTests : public ContentBrowserTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(switches::kSingleProcess); #if defined(OS_WIN) // Don't want to try to create a GPU process. diff --git a/content/renderer/savable_resources_browsertest.cc b/content/renderer/savable_resources_browsertest.cc index 730b28b..5b87943 100644 --- a/content/renderer/savable_resources_browsertest.cc +++ b/content/renderer/savable_resources_browsertest.cc @@ -18,7 +18,7 @@ namespace content { class SavableResourcesTest : public ContentBrowserTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(switches::kSingleProcess); #if defined(OS_WIN) // Don't want to try to create a GPU process. diff --git a/content/renderer/scheduler_proxy_task_runner.h b/content/renderer/scheduler_proxy_task_runner.h index c4ccb2a..bddd349 100644 --- a/content/renderer/scheduler_proxy_task_runner.h +++ b/content/renderer/scheduler_proxy_task_runner.h @@ -25,13 +25,13 @@ class SchedulerProxyTaskRunner : public base::SingleThreadTaskRunner { next_sequence_num_(0) {} // base::SingleThreadTaskRunner implementation: - virtual bool RunsTasksOnCurrentThread() const OVERRIDE { + virtual bool RunsTasksOnCurrentThread() const override { return base::PlatformThread::CurrentId() == main_thread_id_; } virtual bool PostDelayedTask(const tracked_objects::Location& from_here, const base::Closure& task, - base::TimeDelta delay) OVERRIDE { + base::TimeDelta delay) override { DCHECK(delay == base::TimeDelta()); base::PendingTask pending_task(from_here, task); pending_task.sequence_num = ++next_sequence_num_; @@ -47,7 +47,7 @@ class SchedulerProxyTaskRunner : public base::SingleThreadTaskRunner { virtual bool PostNonNestableDelayedTask( const tracked_objects::Location& from_here, const base::Closure& task, - base::TimeDelta delay) OVERRIDE { + base::TimeDelta delay) override { NOTREACHED(); return false; } diff --git a/content/renderer/scheduler_proxy_task_runner_browsertest.cc b/content/renderer/scheduler_proxy_task_runner_browsertest.cc index d2088e1..d8f0cfc 100644 --- a/content/renderer/scheduler_proxy_task_runner_browsertest.cc +++ b/content/renderer/scheduler_proxy_task_runner_browsertest.cc @@ -22,7 +22,7 @@ void TestTask(int value, int* result) { class DummyListener : public IPC::Listener { public: - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) override { return true; } }; diff --git a/content/renderer/screen_orientation/screen_orientation_dispatcher.h b/content/renderer/screen_orientation/screen_orientation_dispatcher.h index fe215b9..21dbf51 100644 --- a/content/renderer/screen_orientation/screen_orientation_dispatcher.h +++ b/content/renderer/screen_orientation/screen_orientation_dispatcher.h @@ -33,13 +33,13 @@ class CONTENT_EXPORT ScreenOrientationDispatcher : friend class ScreenOrientationDispatcherTest; // RenderFrameObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // blink::WebScreenOrientationClient implementation. virtual void lockOrientation( blink::WebScreenOrientationLockType orientation, - blink::WebLockOrientationCallback* callback) OVERRIDE; - virtual void unlockOrientation() OVERRIDE; + blink::WebLockOrientationCallback* callback) override; + virtual void unlockOrientation() override; void OnLockSuccess(int request_id); void OnLockError(int request_id, diff --git a/content/renderer/screen_orientation/screen_orientation_dispatcher_unittest.cc b/content/renderer/screen_orientation/screen_orientation_dispatcher_unittest.cc index 9eb03c6..678ebda 100644 --- a/content/renderer/screen_orientation/screen_orientation_dispatcher_unittest.cc +++ b/content/renderer/screen_orientation/screen_orientation_dispatcher_unittest.cc @@ -59,7 +59,7 @@ class ScreenOrientationDispatcherWithSink : public ScreenOrientationDispatcher { :ScreenOrientationDispatcher(NULL) , sink_(sink) { } - virtual bool Send(IPC::Message* message) OVERRIDE { + virtual bool Send(IPC::Message* message) override { return sink_->Send(message); } @@ -68,7 +68,7 @@ class ScreenOrientationDispatcherWithSink : public ScreenOrientationDispatcher { class ScreenOrientationDispatcherTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { dispatcher_.reset(new ScreenOrientationDispatcherWithSink(&sink_)); } diff --git a/content/renderer/screen_orientation/screen_orientation_observer.h b/content/renderer/screen_orientation/screen_orientation_observer.h index 1c6b5bf..bb48165 100644 --- a/content/renderer/screen_orientation/screen_orientation_observer.h +++ b/content/renderer/screen_orientation/screen_orientation_observer.h @@ -22,11 +22,11 @@ class ScreenOrientationObserver virtual ~ScreenOrientationObserver(); // Overriding this method just to make sure |listener| is always null. - virtual void Start(blink::WebPlatformEventListener* listener) OVERRIDE; + virtual void Start(blink::WebPlatformEventListener* listener) override; protected: - virtual void SendStartMessage() OVERRIDE; - virtual void SendStopMessage() OVERRIDE; + virtual void SendStartMessage() override; + virtual void SendStopMessage() override; }; }; // namespace content diff --git a/content/renderer/service_worker/embedded_worker_context_message_filter.h b/content/renderer/service_worker/embedded_worker_context_message_filter.h index 3060d8e..50489c02 100644 --- a/content/renderer/service_worker/embedded_worker_context_message_filter.h +++ b/content/renderer/service_worker/embedded_worker_context_message_filter.h @@ -22,8 +22,8 @@ class EmbeddedWorkerContextMessageFilter : public ChildMessageFilter { // ChildMessageFilter implementation: virtual base::TaskRunner* OverrideTaskRunnerForMessage( - const IPC::Message& msg) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; + const IPC::Message& msg) override; + virtual bool OnMessageReceived(const IPC::Message& msg) override; private: scoped_refptr<base::MessageLoopProxy> main_thread_loop_proxy_; diff --git a/content/renderer/service_worker/embedded_worker_devtools_agent.h b/content/renderer/service_worker/embedded_worker_devtools_agent.h index 79ce73e..2035c7b 100644 --- a/content/renderer/service_worker/embedded_worker_devtools_agent.h +++ b/content/renderer/service_worker/embedded_worker_devtools_agent.h @@ -27,7 +27,7 @@ class EmbeddedWorkerDevToolsAgent : public IPC::Listener { int route_id); virtual ~EmbeddedWorkerDevToolsAgent(); - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; private: void OnAttach(const std::string& host_id); diff --git a/content/renderer/service_worker/embedded_worker_dispatcher.h b/content/renderer/service_worker/embedded_worker_dispatcher.h index cdb07e0..5e4eee9 100644 --- a/content/renderer/service_worker/embedded_worker_dispatcher.h +++ b/content/renderer/service_worker/embedded_worker_dispatcher.h @@ -26,7 +26,7 @@ class EmbeddedWorkerDispatcher : public IPC::Listener { virtual ~EmbeddedWorkerDispatcher(); // IPC::Listener overrides. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; void WorkerContextDestroyed(int embedded_worker_id); diff --git a/content/renderer/shared_worker/embedded_shared_worker_stub.h b/content/renderer/shared_worker/embedded_shared_worker_stub.h index a3f3404..92fdd0b 100644 --- a/content/renderer/shared_worker/embedded_shared_worker_stub.h +++ b/content/renderer/shared_worker/embedded_shared_worker_stub.h @@ -42,25 +42,25 @@ class EmbeddedSharedWorkerStub : public IPC::Listener, int route_id); // IPC::Listener implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - virtual void OnChannelError() OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; + virtual void OnChannelError() override; // blink::WebSharedWorkerClient implementation. - virtual void workerContextClosed() OVERRIDE; - virtual void workerContextDestroyed() OVERRIDE; - virtual void workerReadyForInspection() OVERRIDE; - virtual void workerScriptLoaded() OVERRIDE; - virtual void workerScriptLoadFailed() OVERRIDE; - virtual void selectAppCacheID(long long) OVERRIDE; - virtual blink::WebNotificationPresenter* notificationPresenter() OVERRIDE; + virtual void workerContextClosed() override; + virtual void workerContextDestroyed() override; + virtual void workerReadyForInspection() override; + virtual void workerScriptLoaded() override; + virtual void workerScriptLoadFailed() override; + virtual void selectAppCacheID(long long) override; + virtual blink::WebNotificationPresenter* notificationPresenter() override; virtual blink::WebApplicationCacheHost* createApplicationCacheHost( - blink::WebApplicationCacheHostClient*) OVERRIDE; + blink::WebApplicationCacheHostClient*) override; virtual blink::WebWorkerPermissionClientProxy* createWorkerPermissionClientProxy( - const blink::WebSecurityOrigin& origin) OVERRIDE; + const blink::WebSecurityOrigin& origin) override; virtual void dispatchDevToolsMessage( - const blink::WebString& message) OVERRIDE; - virtual void saveDevToolsAgentState(const blink::WebString& state) OVERRIDE; + const blink::WebString& message) override; + virtual void saveDevToolsAgentState(const blink::WebString& state) override; private: virtual ~EmbeddedSharedWorkerStub(); diff --git a/content/renderer/shared_worker_repository.h b/content/renderer/shared_worker_repository.h index 4e49217..e5fcbb50 100644 --- a/content/renderer/shared_worker_repository.h +++ b/content/renderer/shared_worker_repository.h @@ -28,8 +28,8 @@ class SharedWorkerRepository : public RenderFrameObserver, const blink::WebString& name, DocumentID document_id, const blink::WebString& content_security_policy, - blink::WebContentSecurityPolicyType) OVERRIDE; - virtual void documentDetached(DocumentID document_id) OVERRIDE; + blink::WebContentSecurityPolicyType) override; + virtual void documentDetached(DocumentID document_id) override; private: std::set<DocumentID> documents_with_workers_; diff --git a/content/renderer/skia_benchmarking_extension.h b/content/renderer/skia_benchmarking_extension.h index 974ae12..716378d 100644 --- a/content/renderer/skia_benchmarking_extension.h +++ b/content/renderer/skia_benchmarking_extension.h @@ -32,7 +32,7 @@ class SkiaBenchmarking : public gin::Wrappable<SkiaBenchmarking> { // gin::Wrappable. virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder( - v8::Isolate* isolate) OVERRIDE; + v8::Isolate* isolate) override; // Rasterizes a Picture JSON-encoded by cc::Picture::AsValue(). // diff --git a/content/renderer/speech_recognition_dispatcher.h b/content/renderer/speech_recognition_dispatcher.h index bae0e5d..450f484 100644 --- a/content/renderer/speech_recognition_dispatcher.h +++ b/content/renderer/speech_recognition_dispatcher.h @@ -33,16 +33,16 @@ class SpeechRecognitionDispatcher : public RenderViewObserver, private: // RenderViewObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // blink::WebSpeechRecognizer implementation. virtual void start(const blink::WebSpeechRecognitionHandle&, const blink::WebSpeechRecognitionParams&, - blink::WebSpeechRecognizerClient*) OVERRIDE; + blink::WebSpeechRecognizerClient*) override; virtual void stop(const blink::WebSpeechRecognitionHandle&, - blink::WebSpeechRecognizerClient*) OVERRIDE; + blink::WebSpeechRecognizerClient*) override; virtual void abort(const blink::WebSpeechRecognitionHandle&, - blink::WebSpeechRecognizerClient*) OVERRIDE; + blink::WebSpeechRecognizerClient*) override; void OnRecognitionStarted(int request_id); void OnAudioStarted(int request_id); diff --git a/content/renderer/stats_collection_controller.h b/content/renderer/stats_collection_controller.h index 279fed7..d847098 100644 --- a/content/renderer/stats_collection_controller.h +++ b/content/renderer/stats_collection_controller.h @@ -31,7 +31,7 @@ class StatsCollectionController // gin::WrappableBase virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder( - v8::Isolate* isolate) OVERRIDE; + v8::Isolate* isolate) override; // Retrieves a histogram and returns a JSON representation of it. std::string GetHistogram(const std::string& histogram_name); diff --git a/content/renderer/stats_collection_observer.h b/content/renderer/stats_collection_observer.h index 2717fd9..d4efbbc 100644 --- a/content/renderer/stats_collection_observer.h +++ b/content/renderer/stats_collection_observer.h @@ -20,8 +20,8 @@ class StatsCollectionObserver : public RenderViewObserver { virtual ~StatsCollectionObserver(); // RenderViewObserver implementation - virtual void DidStartLoading() OVERRIDE; - virtual void DidStopLoading() OVERRIDE; + virtual void DidStartLoading() override; + virtual void DidStopLoading() override; // Timing for the page load start and stop. These functions may return // a null time value under various circumstances. diff --git a/content/renderer/text_input_client_observer.h b/content/renderer/text_input_client_observer.h index a4a471d..6e0734e 100644 --- a/content/renderer/text_input_client_observer.h +++ b/content/renderer/text_input_client_observer.h @@ -28,7 +28,7 @@ class TextInputClientObserver : public RenderViewObserver { virtual ~TextInputClientObserver(); // RenderViewObserver overrides: - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; private: // Returns the WebView of the RenderView. diff --git a/content/renderer/v8_value_converter_impl.h b/content/renderer/v8_value_converter_impl.h index affbed7..7cf4da0 100644 --- a/content/renderer/v8_value_converter_impl.h +++ b/content/renderer/v8_value_converter_impl.h @@ -26,17 +26,17 @@ class CONTENT_EXPORT V8ValueConverterImpl : public V8ValueConverter { V8ValueConverterImpl(); // V8ValueConverter implementation. - virtual void SetDateAllowed(bool val) OVERRIDE; - virtual void SetRegExpAllowed(bool val) OVERRIDE; - virtual void SetFunctionAllowed(bool val) OVERRIDE; - virtual void SetStripNullFromObjects(bool val) OVERRIDE; - virtual void SetStrategy(Strategy* strategy) OVERRIDE; + virtual void SetDateAllowed(bool val) override; + virtual void SetRegExpAllowed(bool val) override; + virtual void SetFunctionAllowed(bool val) override; + virtual void SetStripNullFromObjects(bool val) override; + virtual void SetStrategy(Strategy* strategy) override; virtual v8::Handle<v8::Value> ToV8Value( const base::Value* value, - v8::Handle<v8::Context> context) const OVERRIDE; + v8::Handle<v8::Context> context) const override; virtual base::Value* FromV8Value( v8::Handle<v8::Value> value, - v8::Handle<v8::Context> context) const OVERRIDE; + v8::Handle<v8::Context> context) const override; private: friend class ScopedAvoidIdentityHashForTesting; diff --git a/content/renderer/v8_value_converter_impl_unittest.cc b/content/renderer/v8_value_converter_impl_unittest.cc index 6f1302d..b4bcb5f 100644 --- a/content/renderer/v8_value_converter_impl_unittest.cc +++ b/content/renderer/v8_value_converter_impl_unittest.cc @@ -720,29 +720,29 @@ class V8ValueConverterOverridingStrategyForTesting v8::Handle<v8::Object> value, base::Value** out, v8::Isolate* isolate, - const FromV8ValueCallback& callback) const OVERRIDE { + const FromV8ValueCallback& callback) const override { *out = NewReferenceValue(); return true; } virtual bool FromV8Array(v8::Handle<v8::Array> value, base::Value** out, v8::Isolate* isolate, - const FromV8ValueCallback& callback) const OVERRIDE { + const FromV8ValueCallback& callback) const override { *out = NewReferenceValue(); return true; } virtual bool FromV8ArrayBuffer(v8::Handle<v8::Object> value, base::Value** out, - v8::Isolate* isolate) const OVERRIDE { + v8::Isolate* isolate) const override { *out = NewReferenceValue(); return true; } virtual bool FromV8Number(v8::Handle<v8::Number> value, - base::Value** out) const OVERRIDE { + base::Value** out) const override { *out = NewReferenceValue(); return true; } - virtual bool FromV8Undefined(base::Value** out) const OVERRIDE { + virtual bool FromV8Undefined(base::Value** out) const override { *out = NewReferenceValue(); return true; } @@ -813,25 +813,25 @@ class V8ValueConverterBypassStrategyForTesting v8::Handle<v8::Object> value, base::Value** out, v8::Isolate* isolate, - const FromV8ValueCallback& callback) const OVERRIDE { + const FromV8ValueCallback& callback) const override { return false; } virtual bool FromV8Array(v8::Handle<v8::Array> value, base::Value** out, v8::Isolate* isolate, - const FromV8ValueCallback& callback) const OVERRIDE { + const FromV8ValueCallback& callback) const override { return false; } virtual bool FromV8ArrayBuffer(v8::Handle<v8::Object> value, base::Value** out, - v8::Isolate* isolate) const OVERRIDE { + v8::Isolate* isolate) const override { return false; } virtual bool FromV8Number(v8::Handle<v8::Number> value, - base::Value** out) const OVERRIDE { + base::Value** out) const override { return false; } - virtual bool FromV8Undefined(base::Value** out) const OVERRIDE { + virtual bool FromV8Undefined(base::Value** out) const override { return false; } }; diff --git a/content/renderer/web_ui_extension_data.h b/content/renderer/web_ui_extension_data.h index 0ca1513..c3283b5 100644 --- a/content/renderer/web_ui_extension_data.h +++ b/content/renderer/web_ui_extension_data.h @@ -27,7 +27,7 @@ class WebUIExtensionData private: // RenderViewObserver implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; void OnSetWebUIProperty(const std::string& name, const std::string& value); diff --git a/content/renderer/web_ui_mojo.h b/content/renderer/web_ui_mojo.h index 8a758a5..b3d67f6 100644 --- a/content/renderer/web_ui_mojo.h +++ b/content/renderer/web_ui_mojo.h @@ -38,8 +38,8 @@ class WebUIMojo // RenderFrameObserver overrides: virtual void WillReleaseScriptContext(v8::Handle<v8::Context> context, - int world_id) OVERRIDE; - virtual void DidFinishDocumentLoad() OVERRIDE; + int world_id) override; + virtual void DidFinishDocumentLoad() override; private: WebUIMojo* web_ui_mojo_; @@ -59,8 +59,8 @@ class WebUIMojo WebUIMojoContextState* GetContextState(); // RenderViewObserver overrides: - virtual void DidCreateDocumentElement(blink::WebLocalFrame* frame) OVERRIDE; - virtual void DidClearWindowObject(blink::WebLocalFrame* frame) OVERRIDE; + virtual void DidCreateDocumentElement(blink::WebLocalFrame* frame) override; + virtual void DidClearWindowObject(blink::WebLocalFrame* frame) override; MainFrameObserver main_frame_observer_; diff --git a/content/renderer/web_ui_mojo_context_state.h b/content/renderer/web_ui_mojo_context_state.h index 74a435a..237feb5 100644 --- a/content/renderer/web_ui_mojo_context_state.h +++ b/content/renderer/web_ui_mojo_context_state.h @@ -60,7 +60,7 @@ class WebUIMojoContextState : public gin::ModuleRegistryObserver { // gin::ModuleRegistryObserver overrides: virtual void OnDidAddPendingModule( const std::string& id, - const std::vector<std::string>& dependencies) OVERRIDE; + const std::vector<std::string>& dependencies) override; // Frame script is executed in. Also used to download resources. blink::WebFrame* frame_; diff --git a/content/renderer/web_ui_runner.h b/content/renderer/web_ui_runner.h index 4af8013..1df6cd2 100644 --- a/content/renderer/web_ui_runner.h +++ b/content/renderer/web_ui_runner.h @@ -24,12 +24,12 @@ class WebUIRunner : public gin::Runner { // Runner overrides: virtual void Run(const std::string& source, - const std::string& resource_name) OVERRIDE; + const std::string& resource_name) override; virtual v8::Handle<v8::Value> Call(v8::Handle<v8::Function> function, v8::Handle<v8::Value> receiver, int argc, - v8::Handle<v8::Value> argv[]) OVERRIDE; - virtual gin::ContextHolder* GetContextHolder() OVERRIDE; + v8::Handle<v8::Value> argv[]) override; + virtual gin::ContextHolder* GetContextHolder() override; private: // Frame to execute script in. diff --git a/content/renderer/webgraphicscontext3d_provider_impl.h b/content/renderer/webgraphicscontext3d_provider_impl.h index 80c2106..69c2e984 100644 --- a/content/renderer/webgraphicscontext3d_provider_impl.h +++ b/content/renderer/webgraphicscontext3d_provider_impl.h @@ -26,8 +26,8 @@ class CONTENT_EXPORT WebGraphicsContext3DProviderImpl virtual ~WebGraphicsContext3DProviderImpl(); // WebGraphicsContext3DProvider implementation. - virtual blink::WebGraphicsContext3D* context3d() OVERRIDE; - virtual GrContext* grContext() OVERRIDE; + virtual blink::WebGraphicsContext3D* context3d() override; + virtual GrContext* grContext() override; private: scoped_refptr<webkit::gpu::ContextProviderWebContext> provider_; diff --git a/content/renderer/websharedworker_proxy.h b/content/renderer/websharedworker_proxy.h index 0a07489..426bbb4 100644 --- a/content/renderer/websharedworker_proxy.h +++ b/content/renderer/websharedworker_proxy.h @@ -39,7 +39,7 @@ class WebSharedWorkerProxy : public blink::WebSharedWorkerConnector, private: // IPC::Listener implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; // Disconnects the worker (stops listening for incoming messages). void Disconnect(); |