From ee0b42adc4bab82e4fd2df62f9894e4c1ed38b4a Mon Sep 17 00:00:00 2001 From: "mohan.reddy" Date: Tue, 7 Oct 2014 21:53:14 -0700 Subject: [PATCH] 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} --- .../renderer/accessibility/blink_ax_tree_source.h | 18 +-- .../renderer_accessibility_complete.h | 8 +- .../renderer_accessibility_focus_only.h | 8 +- content/renderer/android/address_detector.h | 6 +- content/renderer/android/email_detector.h | 6 +- content/renderer/android/phone_number_detector.h | 6 +- .../renderer/android/renderer_date_time_picker.h | 2 +- .../battery_status/battery_status_dispatcher.h | 8 +- .../battery_status_dispatcher_unittest.cc | 2 +- content/renderer/bmp_image_decoder_unittest.cc | 2 +- content/renderer/browser_plugin/browser_plugin.h | 56 +++---- .../browser_plugin/browser_plugin_manager.h | 8 +- .../renderer/browser_render_view_browsertest.cc | 6 +- content/renderer/child_frame_compositing_helper.h | 2 +- .../device_sensors/device_light_event_pump.h | 12 +- .../device_light_event_pump_unittest.cc | 10 +- .../device_sensors/device_motion_event_pump.h | 12 +- .../device_motion_event_pump_unittest.cc | 10 +- .../device_sensors/device_orientation_event_pump.h | 12 +- .../device_orientation_event_pump_unittest.cc | 10 +- .../device_sensors/device_sensor_event_pump.h | 4 +- content/renderer/devtools/devtools_agent.h | 30 ++-- content/renderer/devtools/devtools_agent_filter.h | 2 +- content/renderer/devtools/devtools_client.h | 6 +- content/renderer/dom_automation_controller.h | 4 +- content/renderer/dom_serializer_browsertest.cc | 4 +- .../dom_storage_cached_area_unittest.cc | 10 +- .../renderer/dom_storage/dom_storage_dispatcher.cc | 12 +- .../renderer/external_popup_menu_browsertest.cc | 2 +- content/renderer/fetchers/resource_fetcher_impl.h | 14 +- content/renderer/gamepad_shared_memory_reader.h | 10 +- content/renderer/geolocation_dispatcher.h | 2 +- content/renderer/gin_browsertest.cc | 2 +- content/renderer/gpu/compositor_output_surface.h | 8 +- .../gpu/compositor_software_output_device.h | 12 +- content/renderer/gpu/frame_swap_message_queue.cc | 14 +- content/renderer/gpu/gpu_benchmarking_extension.cc | 2 +- content/renderer/gpu/mailbox_output_surface.h | 12 +- content/renderer/gpu/queue_message_swap_promise.h | 6 +- .../gpu/queue_message_swap_promise_unittest.cc | 2 +- content/renderer/gpu/render_widget_compositor.h | 40 ++--- content/renderer/gpu/stream_texture_host_android.h | 4 +- content/renderer/ico_image_decoder_unittest.cc | 2 +- content/renderer/idle_user_detector.h | 2 +- content/renderer/image_loading_helper.h | 2 +- content/renderer/in_process_renderer_thread.h | 4 +- content/renderer/input/input_event_filter.h | 18 +-- .../renderer/input/input_event_filter_unittest.cc | 4 +- content/renderer/input/input_handler_proxy.h | 8 +- .../renderer/input/input_handler_proxy_unittest.cc | 18 +-- content/renderer/input/input_handler_wrapper.h | 12 +- content/renderer/java/gin_java_bridge_dispatcher.h | 4 +- content/renderer/java/gin_java_bridge_object.h | 6 +- .../java/gin_java_bridge_value_converter.cc | 2 +- .../java/gin_java_bridge_value_converter.h | 8 +- content/renderer/manifest/manifest_manager.h | 4 +- content/renderer/media/aec_dump_message_filter.h | 8 +- .../renderer/media/android/media_source_delegate.h | 10 +- .../media/android/renderer_demuxer_android.h | 2 +- .../media/android/renderer_media_player_manager.h | 6 +- .../media/android/stream_texture_factory_impl.cc | 8 +- .../media/android/stream_texture_factory_impl.h | 14 +- .../stream_texture_factory_synchronous_impl.cc | 4 +- .../stream_texture_factory_synchronous_impl.h | 14 +- .../media/android/webmediaplayer_android.cc | 4 +- .../media/android/webmediaplayer_android.h | 12 +- .../renderer/media/audio_input_message_filter.cc | 8 +- .../renderer/media/audio_input_message_filter.h | 8 +- content/renderer/media/audio_message_filter.cc | 10 +- content/renderer/media/audio_message_filter.h | 8 +- .../media/audio_message_filter_unittest.cc | 6 +- .../crypto/encrypted_media_player_support_impl.h | 18 +-- .../renderer/media/crypto/key_systems_unittest.cc | 4 +- .../media/crypto/pepper_cdm_wrapper_impl.h | 2 +- content/renderer/media/crypto/ppapi_decryptor.h | 34 ++--- content/renderer/media/crypto/proxy_media_keys.h | 14 +- .../renderer/media/crypto/renderer_cdm_manager.h | 2 +- .../renderer/media/media_stream_audio_processor.h | 12 +- .../renderer/media/media_stream_audio_sink_owner.h | 12 +- content/renderer/media/media_stream_audio_source.h | 2 +- content/renderer/media/media_stream_center.h | 22 +-- content/renderer/media/media_stream_dispatcher.h | 8 +- .../media/media_stream_dispatcher_unittest.cc | 12 +- .../media_stream_video_capture_source_unittest.cc | 2 +- .../media/media_stream_video_capturer_source.h | 6 +- content/renderer/media/media_stream_video_source.h | 2 +- content/renderer/media/media_stream_video_track.h | 4 +- .../media/media_stream_video_track_unittest.cc | 2 +- content/renderer/media/midi_dispatcher.h | 2 +- content/renderer/media/midi_message_filter.h | 8 +- .../renderer/media/mock_media_stream_dispatcher.h | 14 +- .../renderer/media/mock_media_stream_registry.h | 2 +- .../renderer/media/mock_media_stream_video_sink.h | 4 +- .../media/mock_media_stream_video_source.h | 8 +- .../renderer/media/mock_peer_connection_impl.cc | 54 +++---- content/renderer/media/mock_peer_connection_impl.h | 38 ++--- content/renderer/media/native_handle_impl.h | 2 +- .../media/peer_connection_audio_sink_owner.h | 12 +- .../media/peer_connection_identity_service.h | 2 +- content/renderer/media/peer_connection_tracker.cc | 2 +- content/renderer/media/peer_connection_tracker.h | 2 +- content/renderer/media/remote_media_stream_impl.cc | 2 +- content/renderer/media/remote_media_stream_impl.h | 2 +- content/renderer/media/render_media_log.h | 2 +- .../renderer_gpu_video_accelerator_factories.h | 18 +-- .../renderer/media/renderer_webaudiodevice_impl.h | 4 +- content/renderer/media/rtc_data_channel_handler.h | 30 ++-- content/renderer/media/rtc_dtmf_sender_handler.h | 10 +- content/renderer/media/rtc_media_constraints.h | 4 +- .../renderer/media/rtc_peer_connection_handler.cc | 14 +- .../renderer/media/rtc_peer_connection_handler.h | 52 +++---- .../media/rtc_peer_connection_handler_unittest.cc | 12 +- content/renderer/media/rtc_video_decoder.h | 24 +-- content/renderer/media/rtc_video_decoder_factory.h | 4 +- .../renderer/media/rtc_video_decoder_unittest.cc | 6 +- content/renderer/media/rtc_video_encoder.cc | 6 +- content/renderer/media/rtc_video_encoder.h | 12 +- content/renderer/media/rtc_video_encoder_factory.h | 10 +- content/renderer/media/rtc_video_renderer.h | 10 +- content/renderer/media/user_media_client_impl.h | 22 +-- .../media/user_media_client_impl_unittest.cc | 14 +- content/renderer/media/video_capture_impl.h | 16 +- .../media/video_capture_impl_manager_unittest.cc | 2 +- .../renderer/media/video_capture_impl_unittest.cc | 2 +- .../renderer/media/video_capture_message_filter.h | 8 +- .../media/video_capture_message_filter_unittest.cc | 2 +- .../media/video_source_handler_unittest.cc | 2 +- content/renderer/media/webaudio_capturer_source.h | 4 +- content/renderer/media/webmediaplayer_ms.h | 6 +- .../webrtc/media_stream_remote_video_source.cc | 4 +- .../webrtc/media_stream_remote_video_source.h | 8 +- .../media_stream_remote_video_source_unittest.cc | 2 +- .../media/webrtc/media_stream_track_metrics.cc | 2 +- .../webrtc/media_stream_track_metrics_unittest.cc | 8 +- .../mock_peer_connection_dependency_factory.cc | 28 ++-- .../mock_peer_connection_dependency_factory.h | 94 ++++++------ .../webrtc/peer_connection_dependency_factory.cc | 2 +- .../webrtc/peer_connection_dependency_factory.h | 6 +- .../media/webrtc/video_destination_handler.cc | 2 +- .../media/webrtc/video_destination_handler.h | 8 +- .../webrtc/video_destination_handler_unittest.cc | 2 +- .../media/webrtc/webrtc_audio_sink_adapter.h | 4 +- .../webrtc/webrtc_local_audio_track_adapter.h | 18 +-- .../webrtc_local_audio_track_adapter_unittest.cc | 2 +- .../media/webrtc/webrtc_media_stream_adapter.h | 4 +- .../webrtc/webrtc_media_stream_adapter_unittest.cc | 2 +- .../media/webrtc/webrtc_video_capturer_adapter.h | 12 +- .../media/webrtc/webrtc_video_track_adapter.h | 2 +- content/renderer/media/webrtc_audio_capturer.h | 4 +- .../media/webrtc_audio_capturer_unittest.cc | 4 +- content/renderer/media/webrtc_audio_device_impl.h | 64 ++++---- .../renderer/media/webrtc_audio_device_not_impl.h | 118 +++++++-------- content/renderer/media/webrtc_audio_renderer.cc | 14 +- content/renderer/media/webrtc_audio_renderer.h | 18 +-- content/renderer/media/webrtc_identity_service.h | 2 +- .../media/webrtc_identity_service_unittest.cc | 4 +- .../renderer/media/webrtc_local_audio_renderer.h | 22 +-- .../media/webrtc_local_audio_source_provider.h | 12 +- .../webrtc_local_audio_source_provider_unittest.cc | 4 +- content/renderer/media/webrtc_local_audio_track.h | 2 +- .../media/webrtc_local_audio_track_unittest.cc | 14 +- content/renderer/memory_benchmarking_extension.h | 2 +- content/renderer/mhtml_generator.h | 2 +- .../renderer/mojo/service_registry_js_wrapper.h | 2 +- .../renderer/notification_permission_dispatcher.h | 2 +- content/renderer/notification_provider.h | 2 +- content/renderer/npapi/plugin_channel_host.h | 10 +- content/renderer/npapi/webplugin_delegate_proxy.cc | 14 +- content/renderer/npapi/webplugin_delegate_proxy.h | 44 +++--- content/renderer/npapi/webplugin_impl.h | 66 ++++----- content/renderer/p2p/ipc_network_manager.h | 6 +- .../renderer/p2p/ipc_network_manager_unittest.cc | 4 +- content/renderer/p2p/ipc_socket_factory.cc | 38 ++--- content/renderer/p2p/ipc_socket_factory.h | 8 +- content/renderer/p2p/port_allocator.h | 4 +- content/renderer/p2p/socket_client_impl.h | 12 +- content/renderer/p2p/socket_dispatcher.h | 12 +- .../pepper/content_renderer_pepper_host_factory.h | 2 +- .../renderer/pepper/fake_pepper_plugin_instance.h | 38 ++--- content/renderer/pepper/host_array_buffer_var.h | 8 +- content/renderer/pepper/host_globals.h | 26 ++-- content/renderer/pepper/host_resource_var.h | 10 +- content/renderer/pepper/host_var_tracker.h | 14 +- .../renderer/pepper/host_var_tracker_unittest.cc | 8 +- content/renderer/pepper/message_channel.h | 12 +- content/renderer/pepper/mock_renderer_ppapi_host.h | 32 ++-- content/renderer/pepper/pepper_audio_input_host.h | 2 +- .../renderer/pepper/pepper_browser_connection.h | 2 +- content/renderer/pepper/pepper_compositor_host.h | 4 +- ...pper_device_enumeration_host_helper_unittest.cc | 4 +- content/renderer/pepper/pepper_file_chooser_host.h | 2 +- .../pepper/pepper_file_ref_renderer_host.h | 4 +- content/renderer/pepper/pepper_file_system_host.h | 4 +- content/renderer/pepper/pepper_graphics_2d_host.h | 4 +- .../renderer/pepper/pepper_hung_plugin_filter.h | 12 +- .../pepper/pepper_in_process_resource_creation.h | 22 +-- .../renderer/pepper/pepper_in_process_router.cc | 2 +- .../renderer/pepper/pepper_media_device_manager.h | 16 +- .../pepper/pepper_media_stream_audio_track_host.h | 12 +- .../pepper/pepper_media_stream_track_host_base.h | 2 +- .../pepper/pepper_media_stream_video_track_host.h | 16 +- .../renderer/pepper/pepper_platform_audio_input.h | 8 +- .../renderer/pepper/pepper_platform_audio_output.h | 6 +- .../renderer/pepper/pepper_plugin_instance_impl.cc | 6 +- .../renderer/pepper/pepper_plugin_instance_impl.h | 162 ++++++++++----------- .../pepper/pepper_proxy_channel_delegate_impl.h | 6 +- content/renderer/pepper/pepper_try_catch.h | 12 +- content/renderer/pepper/pepper_url_loader_host.h | 4 +- .../renderer/pepper/pepper_url_request_unittest.cc | 4 +- .../renderer/pepper/pepper_video_capture_host.h | 2 +- .../renderer/pepper/pepper_video_decoder_host.h | 16 +- .../pepper/pepper_video_destination_host.h | 2 +- content/renderer/pepper/pepper_video_source_host.h | 4 +- content/renderer/pepper/pepper_webplugin_impl.h | 18 +-- content/renderer/pepper/pepper_websocket_host.h | 2 +- content/renderer/pepper/plugin_object.h | 6 +- content/renderer/pepper/ppb_audio_impl.h | 16 +- content/renderer/pepper/ppb_broker_impl.h | 8 +- content/renderer/pepper/ppb_buffer_impl.h | 12 +- .../renderer/pepper/ppb_flash_message_loop_impl.h | 8 +- content/renderer/pepper/ppb_graphics_3d_impl.h | 24 +-- content/renderer/pepper/ppb_image_data_impl.h | 52 +++---- content/renderer/pepper/ppb_scrollbar_impl.h | 32 ++-- content/renderer/pepper/ppb_video_decoder_impl.h | 26 ++-- content/renderer/pepper/ppb_widget_impl.h | 12 +- content/renderer/pepper/renderer_ppapi_host_impl.h | 32 ++-- content/renderer/pepper/resource_converter.h | 10 +- content/renderer/pepper/resource_creation_impl.h | 90 ++++++------ .../renderer/pepper/v8_var_converter_unittest.cc | 10 +- content/renderer/pepper/v8object_var.h | 4 +- content/renderer/pepper/video_decoder_shim.h | 14 +- content/renderer/push_messaging_dispatcher.h | 2 +- content/renderer/render_frame_impl.h | 40 ++--- content/renderer/render_frame_proxy.h | 4 +- content/renderer/render_process_impl.h | 4 +- content/renderer/render_thread_impl.cc | 8 +- content/renderer/render_thread_impl.h | 76 +++++----- content/renderer/render_thread_impl_browsertest.cc | 2 +- content/renderer/render_thread_impl_unittest.cc | 2 +- content/renderer/render_view_browsertest.cc | 16 +- content/renderer/render_view_impl.cc | 6 +- content/renderer/render_view_impl.h | 124 ++++++++-------- .../renderer/render_view_mouse_lock_dispatcher.h | 6 +- content/renderer/render_widget.h | 4 +- .../renderer/render_widget_fullscreen_pepper.cc | 4 +- content/renderer/render_widget_fullscreen_pepper.h | 28 ++-- content/renderer/render_widget_unittest.cc | 4 +- content/renderer/renderer_blink_platform_impl.cc | 2 +- content/renderer/renderer_clipboard_client.cc | 4 +- content/renderer/renderer_clipboard_client.h | 22 +-- content/renderer/renderer_main.cc | 4 +- .../renderer_webapplicationcachehost_impl.h | 6 +- content/renderer/renderer_webcolorchooser_impl.h | 4 +- content/renderer/resource_fetcher_browsertest.cc | 4 +- content/renderer/savable_resources_browsertest.cc | 2 +- content/renderer/scheduler_proxy_task_runner.h | 6 +- .../scheduler_proxy_task_runner_browsertest.cc | 2 +- .../screen_orientation_dispatcher.h | 6 +- .../screen_orientation_dispatcher_unittest.cc | 4 +- .../screen_orientation_observer.h | 6 +- .../embedded_worker_context_message_filter.h | 4 +- .../embedded_worker_devtools_agent.h | 2 +- .../service_worker/embedded_worker_dispatcher.h | 2 +- .../shared_worker/embedded_shared_worker_stub.h | 26 ++-- content/renderer/shared_worker_repository.h | 4 +- content/renderer/skia_benchmarking_extension.h | 2 +- content/renderer/speech_recognition_dispatcher.h | 8 +- content/renderer/stats_collection_controller.h | 2 +- content/renderer/stats_collection_observer.h | 4 +- content/renderer/text_input_client_observer.h | 2 +- content/renderer/v8_value_converter_impl.h | 14 +- .../renderer/v8_value_converter_impl_unittest.cc | 20 +-- content/renderer/web_ui_extension_data.h | 2 +- content/renderer/web_ui_mojo.h | 8 +- content/renderer/web_ui_mojo_context_state.h | 2 +- content/renderer/web_ui_runner.h | 6 +- .../renderer/webgraphicscontext3d_provider_impl.h | 4 +- content/renderer/websharedworker_proxy.h | 2 +- 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 b252b27985f4..f09ebdc29570 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* out_children) const OVERRIDE; + std::vector* 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 63c0d7e690b8..6158dd028127 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 53068081fa28..df42303273e1 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 eea777f13299..e612339adf44 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 ff469e865cdb..97b35c72189d 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 081a427628ef..37413155df96 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 b0bdb50d6614..481d288c0552 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 57255c0263d4..38240bc3a275 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 dd0bed6ca238..31d2c666f0fc 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 a24912636159..e509d58255ce 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 b25f5593e800..667b29150599 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& 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& 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; diff --git a/content/renderer/browser_plugin/browser_plugin_manager.h b/content/renderer/browser_plugin/browser_plugin_manager.h index c87c241d3b32..3793ae6886c9 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 1172d02285d9..bfeeb72ea301 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 4ebfd594fc0e..aca87db35175 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 6acd7291ce8e..46766ec7d27d 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 b1d567c0e255..f6eec3d05f0f 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 97339d45b735..37d4262a2d77 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 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 038870b99b3a..c008cdc2a4f2 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 9f97e91e343e..43e566d26489 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 9b5cb84432db..f95850182dd6 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 e109c113ed24..43e0f64dca49 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 5861e446d041..660acbcff6b3 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 5097f4235851..a3470eeb6b1e 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 0c08324e3ec8..f0321859baf0 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 92dc54e5f6f8..cefb5100dba6 100644 --- a/content/renderer/dom_automation_controller.h +++ b/content/renderer/dom_automation_controller.h @@ -111,10 +111,10 @@ class DomAutomationController : public gin::Wrappable, // 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 8662c8466123..ac9500a68fde 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 eeec43ee91e5..39b1eb76a2f6 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 6764a9bc0177..6d4496632bb1 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 e58d764caff5..e23573dcfc0e 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 5631ed9267de..73c55b36dcb9 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 loader_; diff --git a/content/renderer/gamepad_shared_memory_reader.h b/content/renderer/gamepad_shared_memory_reader.h index d62f88131250..f7343aeefc25 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 f4f916350573..8508514c4665 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 20fa560e0698..7b92c7d46c60 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 0b369b27f3ea..51cc3171b87e 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 3f232e062b96..b57ac26075f2 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 df4185db1391..979f250f49d5 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 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* messages) OVERRIDE { + ScopedVector* 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 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* messages) OVERRIDE { + ScopedVector* 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 a2e948dbdbcd..4af1540bad8e 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 GetNativeFunctionTemplate( v8::Isolate* isolate, - v8::Handle name) OVERRIDE { + v8::Handle 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 8ba90b4be41d..53230c45b9b4 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 d3eabf1d8097..0f4ea1d84503 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 f151d4ca58df..562f41c974ad 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 88367b329ff8..044c9532bb03 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 005d49d3009a..4bd841381bff 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 b59cfe38251c..28d18d6cec9e 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 a5ee80bdd291..516706b5f52d 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 a7d24d6f0fc0..9772986e140e 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 ImageResourceFetcherList; diff --git a/content/renderer/in_process_renderer_thread.h b/content/renderer/in_process_renderer_thread.h index bc5a5d3d2cfa..56b4a8b27093 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 0e39592a47c2..59af5d445dcd 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 d181a03d9299..34f0fa9a8d6c 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 c5f7897f879f..38262a00c4fa 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 d64288cbbf54..59f3efd206df 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 - CreateLatencyInfoSwapPromiseMonitor(ui::LatencyInfo* latency) OVERRIDE { + CreateLatencyInfoSwapPromiseMonitor(ui::LatencyInfo* latency) override { return scoped_ptr(); } - 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 e43040eda2a2..063267e49eac 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 efbd19f1c4c2..f9d5f5449adb 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* 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 2f6c6e4306aa..f3a4c7b18f4d 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, // gin::Wrappable. virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder( - v8::Isolate* isolate) OVERRIDE; + v8::Isolate* isolate) override; // gin::NamedPropertyInterceptor virtual v8::Local GetNamedProperty( - v8::Isolate* isolate, const std::string& property) OVERRIDE; + v8::Isolate* isolate, const std::string& property) override; virtual std::vector 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 ad8fee99bb34..79c521987c9d 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(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 5b834eaa8597..fd343b9fdd51 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 value, base::Value** out, v8::Isolate* isolate, - const FromV8ValueCallback& callback) const OVERRIDE; + const FromV8ValueCallback& callback) const override; virtual bool FromV8ArrayBuffer(v8::Handle value, base::Value** out, - v8::Isolate* isolate) const OVERRIDE; + v8::Isolate* isolate) const override; virtual bool FromV8Number(v8::Handle 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 converter_; diff --git a/content/renderer/manifest/manifest_manager.h b/content/renderer/manifest/manifest_manager.h index 336113869242..bae1fef6a10c 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 7268132d2ef7..835171b8d11e 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 4f66be78aa05..c451e0724ae0 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 99c8cc9cf6f2..2fddc8620483 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 454e03396d9c..8a9fbb3763b8 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 09466c5cef54..48b5861ddb6d 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 loop) OVERRIDE; - virtual void Release() OVERRIDE; + scoped_refptr 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 62586b0a0657..f5ded1c8b059 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; 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 57f6ec674e8f..5c0fb59065cd 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 loop) OVERRIDE; - virtual void Release() OVERRIDE; + scoped_refptr 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 460fce7ff551..3f33bd39b1a7 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; diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc index 539b72673f90..2818beef2b60 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 92a94a339499..4321733d798b 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