diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-28 20:00:01 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-28 20:00:01 +0000 |
commit | 5d536b83c1b3aedea54a062085114e3101b32d52 (patch) | |
tree | 3fcfdb5a2a3b789a7af5b169df8b0b248ecf33d4 | |
parent | 63500306b4fd634b340d227964449ec4fd13bda7 (diff) | |
download | chromium_src-5d536b83c1b3aedea54a062085114e3101b32d52.zip chromium_src-5d536b83c1b3aedea54a062085114e3101b32d52.tar.gz chromium_src-5d536b83c1b3aedea54a062085114e3101b32d52.tar.bz2 |
Add OVERRIDE to content/.
BUG=104314
TEST=no change
Review URL: http://codereview.chromium.org/8678021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111755 0039d316-1c4b-4281-b951-d872f2087c98
12 files changed, 53 insertions, 41 deletions
diff --git a/content/browser/geolocation/gps_location_provider_linux.h b/content/browser/geolocation/gps_location_provider_linux.h index 0c1cac3..cda7337 100644 --- a/content/browser/geolocation/gps_location_provider_linux.h +++ b/content/browser/geolocation/gps_location_provider_linux.h @@ -11,6 +11,7 @@ #define CONTENT_BROWSER_GEOLOCATION_GPS_LOCATION_PROVIDER_LINUX_H_ #pragma once +#include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/task.h" @@ -44,11 +45,11 @@ class CONTENT_EXPORT GpsLocationProviderLinux : public LocationProviderBase { } // LocationProvider - virtual bool StartProvider(bool high_accuracy); - virtual void StopProvider(); - virtual void GetPosition(Geoposition* position); - virtual void UpdatePosition(); - virtual void OnPermissionGranted(const GURL& requesting_frame); + virtual bool StartProvider(bool high_accuracy) OVERRIDE; + virtual void StopProvider() OVERRIDE; + virtual void GetPosition(Geoposition* position) OVERRIDE; + virtual void UpdatePosition() OVERRIDE; + virtual void OnPermissionGranted(const GURL& requesting_frame) OVERRIDE; private: // Task which run in the child thread. diff --git a/content/browser/geolocation/wifi_data_provider_linux.h b/content/browser/geolocation/wifi_data_provider_linux.h index fa92ce9..133f5e7 100644 --- a/content/browser/geolocation/wifi_data_provider_linux.h +++ b/content/browser/geolocation/wifi_data_provider_linux.h @@ -6,6 +6,7 @@ #define CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_LINUX_H_ #pragma once +#include "base/compiler_specific.h" #include "content/browser/geolocation/wifi_data_provider_common.h" #include "content/common/content_export.h" @@ -23,8 +24,8 @@ class CONTENT_EXPORT WifiDataProviderLinux : public WifiDataProviderCommon { virtual ~WifiDataProviderLinux(); // WifiDataProviderCommon - virtual WlanApiInterface* NewWlanApi(); - virtual PollingPolicyInterface* NewPollingPolicy(); + virtual WlanApiInterface* NewWlanApi() OVERRIDE; + virtual PollingPolicyInterface* NewPollingPolicy() OVERRIDE; // For testing. WlanApiInterface* NewWlanApiForTesting(dbus::Bus* bus); diff --git a/content/browser/geolocation/win7_location_provider_win.h b/content/browser/geolocation/win7_location_provider_win.h index 5439184..276015b 100644 --- a/content/browser/geolocation/win7_location_provider_win.h +++ b/content/browser/geolocation/win7_location_provider_win.h @@ -5,6 +5,7 @@ #ifndef CONTENT_BROWSER_GEOLOCATION_WIN7_LOCATION_PROVIDER_WIN_H_ #define CONTENT_BROWSER_GEOLOCATION_WIN7_LOCATION_PROVIDER_WIN_H_ +#include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/task.h" @@ -25,11 +26,11 @@ class CONTENT_EXPORT Win7LocationProvider : public LocationProviderBase { virtual ~Win7LocationProvider(); // LocationProvider. - virtual bool StartProvider(bool high_accuracy); - virtual void StopProvider(); - virtual void GetPosition(Geoposition* position); - virtual void UpdatePosition(); - virtual void OnPermissionGranted(const GURL& requesting_frame); + virtual bool StartProvider(bool high_accuracy) OVERRIDE; + virtual void StopProvider() OVERRIDE; + virtual void GetPosition(Geoposition* position) OVERRIDE; + virtual void UpdatePosition() OVERRIDE; + virtual void OnPermissionGranted(const GURL& requesting_frame) OVERRIDE; private: // Task which runs in the child thread. diff --git a/content/browser/gpu/gpu_process_host_ui_shim.h b/content/browser/gpu/gpu_process_host_ui_shim.h index 976a559..939bbd0 100644 --- a/content/browser/gpu/gpu_process_host_ui_shim.h +++ b/content/browser/gpu/gpu_process_host_ui_shim.h @@ -14,6 +14,7 @@ #include <string> #include "base/callback.h" +#include "base/compiler_specific.h" #include "base/task.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" @@ -77,7 +78,7 @@ class GpuProcessHostUIShim // The GpuProcessHost causes this to be called on the UI thread to // dispatch the incoming messages from the GPU process, which are // actually received on the IO thread. - virtual bool OnMessageReceived(const IPC::Message& message); + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; CONTENT_EXPORT void SimulateRemoveAllContext(); CONTENT_EXPORT void SimulateCrash(); diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.h b/content/browser/renderer_host/media/audio_input_renderer_host.h index 1b05532..617bd50 100644 --- a/content/browser/renderer_host/media/audio_input_renderer_host.h +++ b/content/browser/renderer_host/media/audio_input_renderer_host.h @@ -57,6 +57,7 @@ #include <map> +#include "base/compiler_specific.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" @@ -122,8 +123,9 @@ class CONTENT_EXPORT AudioInputRendererHost uint32 size) OVERRIDE; // media_stream::AudioInputDeviceManagerEventHandler implementation. - virtual void OnDeviceStarted(int session_id, const std::string& device_id); - virtual void OnDeviceStopped(int session_id); + virtual void OnDeviceStarted(int session_id, + const std::string& device_id) OVERRIDE; + virtual void OnDeviceStopped(int session_id) OVERRIDE; private: // TODO(henrika): extend test suite (compare AudioRenderHost) diff --git a/content/browser/renderer_host/test_render_view_host.h b/content/browser/renderer_host/test_render_view_host.h index ebfe62f..5f892f1 100644 --- a/content/browser/renderer_host/test_render_view_host.h +++ b/content/browser/renderer_host/test_render_view_host.h @@ -138,13 +138,13 @@ class TestRenderWidgetHostView : public RenderWidgetHostView { #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) virtual void AcceleratedSurfaceNew( int32 width, int32 height, uint64* surface_id, - TransportDIB::Handle* surface_handle) { } - virtual void AcceleratedSurfaceRelease(uint64 surface_id) { } + TransportDIB::Handle* surface_handle) OVERRIDE { } + virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE { } #endif #if defined(TOOLKIT_USES_GTK) - virtual void CreatePluginContainer(gfx::PluginWindowHandle id) { } - virtual void DestroyPluginContainer(gfx::PluginWindowHandle id) { } + virtual void CreatePluginContainer(gfx::PluginWindowHandle id) OVERRIDE { } + virtual void DestroyPluginContainer(gfx::PluginWindowHandle id) OVERRIDE { } #endif virtual gfx::PluginWindowHandle GetCompositingSurface() OVERRIDE; diff --git a/content/browser/tab_contents/web_drag_source_gtk.h b/content/browser/tab_contents/web_drag_source_gtk.h index c6ae104..b56ee33 100644 --- a/content/browser/tab_contents/web_drag_source_gtk.h +++ b/content/browser/tab_contents/web_drag_source_gtk.h @@ -44,8 +44,8 @@ class CONTENT_EXPORT WebDragSourceGtk : public MessageLoopForUI::Observer { const gfx::Point& image_offset); // MessageLoop::Observer implementation: - virtual void WillProcessEvent(GdkEvent* event); - virtual void DidProcessEvent(GdkEvent* event); + virtual void WillProcessEvent(GdkEvent* event) OVERRIDE; + virtual void DidProcessEvent(GdkEvent* event) OVERRIDE; private: CHROMEGTK_CALLBACK_2(WebDragSourceGtk, gboolean, OnDragFailed, diff --git a/content/common/font_config_ipc_linux.h b/content/common/font_config_ipc_linux.h index ed23c28..411ae5a 100644 --- a/content/common/font_config_ipc_linux.h +++ b/content/common/font_config_ipc_linux.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,6 +6,7 @@ #define CONTENT_COMMON_FONT_CONFIG_IPC_LINUX_H_ #pragma once +#include "base/compiler_specific.h" #include "skia/ext/SkFontHost_fontconfig_impl.h" #include <string> @@ -25,8 +26,8 @@ class FontConfigIPC : public FontConfigInterface { const std::string& family, const void* characters, size_t characters_bytes, - bool* is_bold, bool* is_italic); - virtual int Open(unsigned filefaceid); + bool* is_bold, bool* is_italic) OVERRIDE; + virtual int Open(unsigned filefaceid) OVERRIDE; enum Method { METHOD_MATCH = 0, diff --git a/content/common/gpu/image_transport_surface.h b/content/common/gpu/image_transport_surface.h index b58ff12c..69ce265 100644 --- a/content/common/gpu/image_transport_surface.h +++ b/content/common/gpu/image_transport_surface.h @@ -9,6 +9,7 @@ #if defined(ENABLE_GPU) #include "base/callback.h" +#include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "ipc/ipc_channel.h" @@ -153,8 +154,8 @@ class PassThroughImageTransportSurface virtual ~PassThroughImageTransportSurface(); // GLSurface implementation. - virtual bool Initialize(); - virtual void Destroy(); + virtual bool Initialize() OVERRIDE; + virtual void Destroy() OVERRIDE; // ImageTransportSurface implementation. virtual void OnNewSurfaceACK( diff --git a/content/renderer/media/audio_input_device.h b/content/renderer/media/audio_input_device.h index 88e7799..56379fe 100644 --- a/content/renderer/media/audio_input_device.h +++ b/content/renderer/media/audio_input_device.h @@ -72,6 +72,7 @@ #include <vector> #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/shared_memory.h" #include "base/threading/simple_thread.h" @@ -149,10 +150,10 @@ class CONTENT_EXPORT AudioInputDevice // AudioInputMessageFilter::Delegate impl., called by AudioInputMessageFilter virtual void OnLowLatencyCreated(base::SharedMemoryHandle handle, base::SyncSocket::Handle socket_handle, - uint32 length); - virtual void OnVolume(double volume); - virtual void OnStateChanged(AudioStreamState state); - virtual void OnDeviceReady(const std::string& device_id); + uint32 length) OVERRIDE; + virtual void OnVolume(double volume) OVERRIDE; + virtual void OnStateChanged(AudioStreamState state) OVERRIDE; + virtual void OnDeviceReady(const std::string& device_id) OVERRIDE; private: // Methods called on IO thread ---------------------------------------------- diff --git a/content/renderer/media/webrtc_audio_device_impl.h b/content/renderer/media/webrtc_audio_device_impl.h index 5498783..fac2024 100644 --- a/content/renderer/media/webrtc_audio_device_impl.h +++ b/content/renderer/media/webrtc_audio_device_impl.h @@ -121,8 +121,8 @@ class CONTENT_EXPORT WebRtcAudioDeviceImpl size_t audio_delay_milliseconds) OVERRIDE; // AudioInputDevice::CaptureEventHandler implementation. - virtual void OnDeviceStarted(const std::string& device_id); - virtual void OnDeviceStopped(); + virtual void OnDeviceStarted(const std::string& device_id) OVERRIDE; + virtual void OnDeviceStopped() OVERRIDE; // webrtc::Module implementation. virtual int32_t Version(char* version, diff --git a/content/renderer/renderer_clipboard_client.h b/content/renderer/renderer_clipboard_client.h index 46c7db1..df0ab07 100644 --- a/content/renderer/renderer_clipboard_client.h +++ b/content/renderer/renderer_clipboard_client.h @@ -5,6 +5,7 @@ #ifndef CONTENT_RENDERER_RENDERER_CLIPBOARD_CLIENT_H_ #define CONTENT_RENDERER_RENDERER_CLIPBOARD_CLIENT_H_ +#include "base/compiler_specific.h" #include "webkit/glue/clipboard_client.h" // An implementation of ClipboardClient that gets and sends data over IPC. @@ -13,21 +14,23 @@ class RendererClipboardClient : public webkit_glue::ClipboardClient { RendererClipboardClient(); virtual ~RendererClipboardClient(); - virtual ui::Clipboard* GetClipboard(); - virtual uint64 GetSequenceNumber(ui::Clipboard::Buffer buffer); + virtual ui::Clipboard* GetClipboard() OVERRIDE; + virtual uint64 GetSequenceNumber(ui::Clipboard::Buffer buffer) OVERRIDE; virtual bool IsFormatAvailable(const ui::Clipboard::FormatType& format, - ui::Clipboard::Buffer buffer); + ui::Clipboard::Buffer buffer) OVERRIDE; virtual void ReadAvailableTypes(ui::Clipboard::Buffer buffer, std::vector<string16>* types, - bool* contains_filenames); - virtual void ReadText(ui::Clipboard::Buffer buffer, string16* result); + bool* contains_filenames) OVERRIDE; + virtual void ReadText(ui::Clipboard::Buffer buffer, + string16* result) OVERRIDE; virtual void ReadAsciiText(ui::Clipboard::Buffer buffer, - std::string* result); + std::string* result) OVERRIDE; virtual void ReadHTML(ui::Clipboard::Buffer buffer, string16* markup, GURL* url, uint32* fragment_start, - uint32* fragment_end); - virtual void ReadImage(ui::Clipboard::Buffer buffer, std::string* data); - virtual WriteContext* CreateWriteContext(); + uint32* fragment_end) OVERRIDE; + virtual void ReadImage(ui::Clipboard::Buffer buffer, + std::string* data) OVERRIDE; + virtual WriteContext* CreateWriteContext() OVERRIDE; }; #endif // CONTENT_RENDERER_RENDERER_CLIPBOARD_CLIENT_H_ |