summaryrefslogtreecommitdiffstats
path: root/content/common
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-17 20:07:38 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-17 20:07:38 +0000
commitedc64de774e1af065b16996295053f0b92d22cb0 (patch)
tree9370bffca9da7615718c67448bcb5631016a8ad1 /content/common
parentc193faf261d5542429d6363a9f5f295ee7c1d70f (diff)
downloadchromium_src-edc64de774e1af065b16996295053f0b92d22cb0.zip
chromium_src-edc64de774e1af065b16996295053f0b92d22cb0.tar.gz
chromium_src-edc64de774e1af065b16996295053f0b92d22cb0.tar.bz2
Add OVERRIDE to content/.
BUG=104314 TEST=no change Review URL: http://codereview.chromium.org/8587009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110544 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
-rw-r--r--content/common/appcache/appcache_backend_proxy.h26
-rw-r--r--content/common/appcache/appcache_dispatcher.h2
-rw-r--r--content/common/child_process_host.h2
-rw-r--r--content/common/child_thread.h6
-rw-r--r--content/common/child_trace_message_filter.h6
-rw-r--r--content/common/db_message_filter.h2
-rw-r--r--content/common/file_system/file_system_dispatcher.h2
-rw-r--r--content/common/file_system/webfilesystem_callback_dispatcher.h12
-rw-r--r--content/common/file_system/webfilewriter_impl.h6
-rw-r--r--content/common/gpu/gpu_channel.h2
-rw-r--r--content/common/gpu/gpu_channel_manager.h4
-rw-r--r--content/common/gpu/gpu_command_buffer_stub.h4
-rw-r--r--content/common/gpu/media/gpu_video_decode_accelerator.h2
-rw-r--r--content/common/hi_res_timer_manager.h2
-rw-r--r--content/common/message_router.h4
-rw-r--r--content/common/np_channel_base.h2
-rw-r--r--content/common/npobject_proxy.h10
-rw-r--r--content/common/npobject_stub.h10
-rw-r--r--content/common/pepper_plugin_registry.h3
-rw-r--r--content/common/quota_dispatcher.h2
-rw-r--r--content/common/resource_dispatcher.h2
-rw-r--r--content/common/socket_stream_dispatcher.h2
-rw-r--r--content/common/webmessageportchannel_impl.h2
23 files changed, 59 insertions, 56 deletions
diff --git a/content/common/appcache/appcache_backend_proxy.h b/content/common/appcache/appcache_backend_proxy.h
index af09abf..050c07d 100644
--- a/content/common/appcache/appcache_backend_proxy.h
+++ b/content/common/appcache/appcache_backend_proxy.h
@@ -18,28 +18,30 @@ class AppCacheBackendProxy : public appcache::AppCacheBackend {
IPC::Message::Sender* sender() const { return sender_; }
// AppCacheBackend methods
- virtual void RegisterHost(int host_id);
- virtual void UnregisterHost(int host_id);
- virtual void SetSpawningHostId(int host_id, int spawning_host_id);
+ virtual void RegisterHost(int host_id) OVERRIDE;
+ virtual void UnregisterHost(int host_id) OVERRIDE;
+ virtual void SetSpawningHostId(int host_id, int spawning_host_id) OVERRIDE;
virtual void SelectCache(int host_id,
const GURL& document_url,
const int64 cache_document_was_loaded_from,
- const GURL& manifest_url);
+ const GURL& manifest_url) OVERRIDE;
virtual void SelectCacheForWorker(
int host_id,
int parent_process_id,
- int parent_host_id);
+ int parent_host_id) OVERRIDE;
virtual void SelectCacheForSharedWorker(
int host_id,
- int64 appcache_id);
- virtual void MarkAsForeignEntry(int host_id, const GURL& document_url,
- int64 cache_document_was_loaded_from);
- virtual appcache::Status GetStatus(int host_id);
- virtual bool StartUpdate(int host_id);
- virtual bool SwapCache(int host_id);
+ int64 appcache_id) OVERRIDE;
+ virtual void MarkAsForeignEntry(
+ int host_id,
+ const GURL& document_url,
+ int64 cache_document_was_loaded_from) OVERRIDE;
+ virtual appcache::Status GetStatus(int host_id) OVERRIDE;
+ virtual bool StartUpdate(int host_id) OVERRIDE;
+ virtual bool SwapCache(int host_id) OVERRIDE;
virtual void GetResourceList(
int host_id,
- std::vector<appcache::AppCacheResourceInfo>* resource_infos);
+ std::vector<appcache::AppCacheResourceInfo>* resource_infos) OVERRIDE;
private:
IPC::Message::Sender* sender_;
diff --git a/content/common/appcache/appcache_dispatcher.h b/content/common/appcache/appcache_dispatcher.h
index aafaa395..88f1455 100644
--- a/content/common/appcache/appcache_dispatcher.h
+++ b/content/common/appcache/appcache_dispatcher.h
@@ -24,7 +24,7 @@ class AppCacheDispatcher : public IPC::Channel::Listener {
AppCacheBackendProxy* backend_proxy() { return &backend_proxy_; }
// IPC::Channel::Listener implementation
- virtual bool OnMessageReceived(const IPC::Message& msg);
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
private:
// Ipc message handlers
diff --git a/content/common/child_process_host.h b/content/common/child_process_host.h
index 0c74fb93..148b2de 100644
--- a/content/common/child_process_host.h
+++ b/content/common/child_process_host.h
@@ -93,7 +93,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Channel::Listener,
#endif // defined(OS_WIN)
// IPC::Message::Sender implementation.
- virtual bool Send(IPC::Message* message);
+ virtual bool Send(IPC::Message* message) OVERRIDE;
// Adds an IPC message filter. A reference will be kept to the filter.
void AddFilter(IPC::ChannelProxy::MessageFilter* filter);
diff --git a/content/common/child_thread.h b/content/common/child_thread.h
index 970ce97..a2b9864 100644
--- a/content/common/child_thread.h
+++ b/content/common/child_thread.h
@@ -35,7 +35,7 @@ class CONTENT_EXPORT ChildThread : public IPC::Channel::Listener,
virtual ~ChildThread();
// IPC::Message::Sender implementation:
- virtual bool Send(IPC::Message* msg);
+ virtual bool Send(IPC::Message* msg) OVERRIDE;
// See documentation on MessageRouter for AddRoute and RemoveRoute
void AddRoute(int32 routing_id, IPC::Channel::Listener* listener);
@@ -103,8 +103,8 @@ class CONTENT_EXPORT ChildThread : public IPC::Channel::Listener,
void Init();
// IPC::Channel::Listener implementation:
- virtual bool OnMessageReceived(const IPC::Message& msg);
- virtual void OnChannelError();
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
std::string channel_name_;
scoped_ptr<IPC::SyncChannel> channel_;
diff --git a/content/common/child_trace_message_filter.h b/content/common/child_trace_message_filter.h
index 242e299..19d3467 100644
--- a/content/common/child_trace_message_filter.h
+++ b/content/common/child_trace_message_filter.h
@@ -18,9 +18,9 @@ class ChildTraceMessageFilter : public IPC::ChannelProxy::MessageFilter {
virtual ~ChildTraceMessageFilter();
// IPC::ChannelProxy::MessageFilter implementation.
- virtual void OnFilterAdded(IPC::Channel* channel);
- virtual void OnFilterRemoved();
- virtual bool OnMessageReceived(const IPC::Message& message);
+ virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE;
+ virtual void OnFilterRemoved() OVERRIDE;
+ virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
private:
// Message handlers.
diff --git a/content/common/db_message_filter.h b/content/common/db_message_filter.h
index 9547166..29d45d0 100644
--- a/content/common/db_message_filter.h
+++ b/content/common/db_message_filter.h
@@ -15,7 +15,7 @@ class DBMessageFilter : public IPC::ChannelProxy::MessageFilter {
DBMessageFilter();
private:
- virtual bool OnMessageReceived(const IPC::Message& message);
+ virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
void OnDatabaseUpdateSize(const string16& origin_identifier,
const string16& database_name,
diff --git a/content/common/file_system/file_system_dispatcher.h b/content/common/file_system/file_system_dispatcher.h
index fe01733..ee436d1 100644
--- a/content/common/file_system/file_system_dispatcher.h
+++ b/content/common/file_system/file_system_dispatcher.h
@@ -33,7 +33,7 @@ class FileSystemDispatcher : public IPC::Channel::Listener {
virtual ~FileSystemDispatcher();
// IPC::Channel::Listener implementation.
- virtual bool OnMessageReceived(const IPC::Message& msg);
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
bool OpenFileSystem(const GURL& origin_url,
fileapi::FileSystemType type,
diff --git a/content/common/file_system/webfilesystem_callback_dispatcher.h b/content/common/file_system/webfilesystem_callback_dispatcher.h
index b8c1aac..fa951d5 100644
--- a/content/common/file_system/webfilesystem_callback_dispatcher.h
+++ b/content/common/file_system/webfilesystem_callback_dispatcher.h
@@ -22,17 +22,17 @@ class WebFileSystemCallbackDispatcher
WebKit::WebFileSystemCallbacks* callbacks);
// FileSystemCallbackDispatcher implementation
- virtual void DidSucceed();
+ virtual void DidSucceed() OVERRIDE;
virtual void DidReadMetadata(
const base::PlatformFileInfo& file_info,
- const FilePath& platform_path);
+ const FilePath& platform_path) OVERRIDE;
virtual void DidReadDirectory(
const std::vector<base::FileUtilProxy::Entry>& entries,
- bool has_more);
+ bool has_more) OVERRIDE;
virtual void DidOpenFileSystem(const std::string&,
- const GURL&);
- virtual void DidFail(base::PlatformFileError);
- virtual void DidWrite(int64 bytes, bool complete);
+ const GURL&) OVERRIDE;
+ virtual void DidFail(base::PlatformFileError) OVERRIDE;
+ virtual void DidWrite(int64 bytes, bool complete) OVERRIDE;
private:
WebKit::WebFileSystemCallbacks* callbacks_;
diff --git a/content/common/file_system/webfilewriter_impl.h b/content/common/file_system/webfilewriter_impl.h
index f5287f4..9c9440f 100644
--- a/content/common/file_system/webfilewriter_impl.h
+++ b/content/common/file_system/webfilewriter_impl.h
@@ -18,10 +18,10 @@ class WebFileWriterImpl : public fileapi::WebFileWriterBase,
protected:
// WebFileWriterBase overrides
- virtual void DoTruncate(const GURL& path, int64 offset);
+ virtual void DoTruncate(const GURL& path, int64 offset) OVERRIDE;
virtual void DoWrite(const GURL& path, const GURL& blob_url,
- int64 offset);
- virtual void DoCancel();
+ int64 offset) OVERRIDE;
+ virtual void DoCancel() OVERRIDE;
private:
class CallbackDispatcher;
diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h
index 8903b74..ece4163 100644
--- a/content/common/gpu/gpu_channel.h
+++ b/content/common/gpu/gpu_channel.h
@@ -70,7 +70,7 @@ class GpuChannel : public IPC::Channel::Listener,
virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
// IPC::Message::Sender implementation:
- virtual bool Send(IPC::Message* msg);
+ virtual bool Send(IPC::Message* msg) OVERRIDE;
// Whether this channel is able to handle IPC messages.
bool IsScheduled();
diff --git a/content/common/gpu/gpu_channel_manager.h b/content/common/gpu/gpu_channel_manager.h
index c20d792..a1a46c3 100644
--- a/content/common/gpu/gpu_channel_manager.h
+++ b/content/common/gpu/gpu_channel_manager.h
@@ -50,10 +50,10 @@ class GpuChannelManager : public IPC::Channel::Listener,
void RemoveChannel(int renderer_id);
// Listener overrides.
- virtual bool OnMessageReceived(const IPC::Message& msg);
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
// Sender overrides.
- virtual bool Send(IPC::Message* msg);
+ virtual bool Send(IPC::Message* msg) OVERRIDE;
void LoseAllContexts();
diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h
index 2e1dc34..86fd9d3 100644
--- a/content/common/gpu/gpu_command_buffer_stub.h
+++ b/content/common/gpu/gpu_command_buffer_stub.h
@@ -58,10 +58,10 @@ class GpuCommandBufferStub
virtual ~GpuCommandBufferStub();
// IPC::Channel::Listener implementation:
- virtual bool OnMessageReceived(const IPC::Message& message);
+ virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
// IPC::Message::Sender implementation:
- virtual bool Send(IPC::Message* msg);
+ virtual bool Send(IPC::Message* msg) OVERRIDE;
// Whether this command buffer can currently handle IPC messages.
bool IsScheduled();
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.h b/content/common/gpu/media/gpu_video_decode_accelerator.h
index f065cff..3acf3f6 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator.h
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.h
@@ -41,7 +41,7 @@ class GpuVideoDecodeAccelerator
virtual void NotifyResetDone() OVERRIDE;
// Function to delegate sending to actual sender.
- virtual bool Send(IPC::Message* message);
+ virtual bool Send(IPC::Message* message) OVERRIDE;
// Initialize the accelerator with the given profile and send the
// |init_done_msg| when done.
diff --git a/content/common/hi_res_timer_manager.h b/content/common/hi_res_timer_manager.h
index ff2ff1f..210789f 100644
--- a/content/common/hi_res_timer_manager.h
+++ b/content/common/hi_res_timer_manager.h
@@ -18,7 +18,7 @@ class CONTENT_EXPORT HighResolutionTimerManager
virtual ~HighResolutionTimerManager();
// base::SystemMonitor::PowerObserver:
- virtual void OnPowerStateChange(bool on_battery_power);
+ virtual void OnPowerStateChange(bool on_battery_power) OVERRIDE;
// Returns true if the hi resolution clock could be used right now.
bool hi_res_clock_available() const { return hi_res_clock_available_; }
diff --git a/content/common/message_router.h b/content/common/message_router.h
index cb97f3f..d0d9c75 100644
--- a/content/common/message_router.h
+++ b/content/common/message_router.h
@@ -37,7 +37,7 @@ class MessageRouter : public IPC::Channel::Listener,
virtual bool OnControlMessageReceived(const IPC::Message& msg);
// IPC::Channel::Listener implementation:
- virtual bool OnMessageReceived(const IPC::Message& msg);
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
// Like OnMessageReceived, except it only handles routed messages. Returns
// true if the message was dispatched, or false if there was no listener for
@@ -45,7 +45,7 @@ class MessageRouter : public IPC::Channel::Listener,
virtual bool RouteMessage(const IPC::Message& msg);
// IPC::Message::Sender implementation:
- virtual bool Send(IPC::Message* msg);
+ virtual bool Send(IPC::Message* msg) OVERRIDE;
// Called to add/remove a listener for a particular message routing ID.
void AddRoute(int32 routing_id, IPC::Channel::Listener* listener);
diff --git a/content/common/np_channel_base.h b/content/common/np_channel_base.h
index dacfb00..d02e9c6 100644
--- a/content/common/np_channel_base.h
+++ b/content/common/np_channel_base.h
@@ -73,7 +73,7 @@ class NPChannelBase : public IPC::Channel::Listener,
// IPC::Message::Sender implementation:
- virtual bool Send(IPC::Message* msg);
+ virtual bool Send(IPC::Message* msg) OVERRIDE;
int peer_pid() { return peer_pid_; }
IPC::ChannelHandle channel_handle() const { return channel_handle_; }
diff --git a/content/common/npobject_proxy.h b/content/common/npobject_proxy.h
index 1902dd1..23e0183 100644
--- a/content/common/npobject_proxy.h
+++ b/content/common/npobject_proxy.h
@@ -39,7 +39,7 @@ class NPObjectProxy : public IPC::Channel::Listener,
const GURL& page_url);
// IPC::Message::Sender implementation:
- virtual bool Send(IPC::Message* msg);
+ virtual bool Send(IPC::Message* msg) OVERRIDE;
int route_id() { return route_id_; }
NPChannelBase* channel() { return channel_; }
@@ -91,9 +91,9 @@ class NPObjectProxy : public IPC::Channel::Listener,
static const NPClass* npclass() { return &npclass_proxy_; }
// NPObjectBase implementation.
- virtual NPObject* GetUnderlyingNPObject();
+ virtual NPObject* GetUnderlyingNPObject() OVERRIDE;
- virtual IPC::Channel::Listener* GetChannelListener();
+ virtual IPC::Channel::Listener* GetChannelListener() OVERRIDE;
private:
NPObjectProxy(NPChannelBase* channel,
@@ -102,8 +102,8 @@ class NPObjectProxy : public IPC::Channel::Listener,
const GURL& page_url);
// IPC::Channel::Listener implementation:
- virtual bool OnMessageReceived(const IPC::Message& msg);
- virtual void OnChannelError();
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
static NPObject* NPAllocate(NPP, NPClass*);
static void NPDeallocate(NPObject* npObj);
diff --git a/content/common/npobject_stub.h b/content/common/npobject_stub.h
index b99ef64..9b64ce8 100644
--- a/content/common/npobject_stub.h
+++ b/content/common/npobject_stub.h
@@ -45,16 +45,16 @@ class NPObjectStub : public IPC::Channel::Listener,
void DeleteSoon();
// IPC::Message::Sender implementation:
- virtual bool Send(IPC::Message* msg);
+ virtual bool Send(IPC::Message* msg) OVERRIDE;
// NPObjectBase implementation.
- virtual NPObject* GetUnderlyingNPObject();
- virtual IPC::Channel::Listener* GetChannelListener();
+ virtual NPObject* GetUnderlyingNPObject() OVERRIDE;
+ virtual IPC::Channel::Listener* GetChannelListener() OVERRIDE;
private:
// IPC::Channel::Listener implementation:
- virtual bool OnMessageReceived(const IPC::Message& message);
- virtual void OnChannelError();
+ virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
// message handlers
void OnRelease(IPC::Message* reply_msg);
diff --git a/content/common/pepper_plugin_registry.h b/content/common/pepper_plugin_registry.h
index 922a6e0..c6a664e 100644
--- a/content/common/pepper_plugin_registry.h
+++ b/content/common/pepper_plugin_registry.h
@@ -64,7 +64,8 @@ class PepperPluginRegistry
void AddLiveModule(const FilePath& path, webkit::ppapi::PluginModule* module);
// ModuleLifetime implementation.
- virtual void PluginModuleDead(webkit::ppapi::PluginModule* dead_module);
+ virtual void PluginModuleDead(
+ webkit::ppapi::PluginModule* dead_module) OVERRIDE;
private:
PepperPluginRegistry();
diff --git a/content/common/quota_dispatcher.h b/content/common/quota_dispatcher.h
index 4faa0e1..1d1c262 100644
--- a/content/common/quota_dispatcher.h
+++ b/content/common/quota_dispatcher.h
@@ -40,7 +40,7 @@ class QuotaDispatcher : public IPC::Channel::Listener {
virtual ~QuotaDispatcher();
// IPC::Channel::Listener implementation.
- virtual bool OnMessageReceived(const IPC::Message& msg);
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
void QueryStorageUsageAndQuota(const GURL& gurl,
quota::StorageType type,
diff --git a/content/common/resource_dispatcher.h b/content/common/resource_dispatcher.h
index 6cc7157..ba74b23 100644
--- a/content/common/resource_dispatcher.h
+++ b/content/common/resource_dispatcher.h
@@ -34,7 +34,7 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Channel::Listener {
virtual ~ResourceDispatcher();
// IPC::Channel::Listener implementation.
- virtual bool OnMessageReceived(const IPC::Message& message);
+ virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
// Creates a ResourceLoaderBridge for this type of dispatcher, this is so
// this can be tested regardless of the ResourceLoaderBridge::Create
diff --git a/content/common/socket_stream_dispatcher.h b/content/common/socket_stream_dispatcher.h
index 3ce0eba..10d8680 100644
--- a/content/common/socket_stream_dispatcher.h
+++ b/content/common/socket_stream_dispatcher.h
@@ -34,7 +34,7 @@ class SocketStreamDispatcher : public IPC::Channel::Listener {
webkit_glue::WebSocketStreamHandleDelegate* delegate);
// IPC::Channel::Listener implementation.
- virtual bool OnMessageReceived(const IPC::Message& msg);
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
private:
void OnConnected(int socket_id, int max_amount_send_allowed);
diff --git a/content/common/webmessageportchannel_impl.h b/content/common/webmessageportchannel_impl.h
index adde1a4..a47ba24 100644
--- a/content/common/webmessageportchannel_impl.h
+++ b/content/common/webmessageportchannel_impl.h
@@ -48,7 +48,7 @@ class WebMessagePortChannelImpl
void Send(IPC::Message* message);
// IPC::Channel::Listener implementation.
- virtual bool OnMessageReceived(const IPC::Message& message);
+ virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
void OnMessage(const string16& message,
const std::vector<int>& sent_message_port_ids,