summaryrefslogtreecommitdiffstats
path: root/content/plugin
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/plugin
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/plugin')
-rw-r--r--content/plugin/plugin_channel.h14
-rw-r--r--content/plugin/plugin_thread.h2
-rw-r--r--content/plugin/webplugin_accelerated_surface_proxy_mac.h11
-rw-r--r--content/plugin/webplugin_delegate_stub.h4
-rw-r--r--content/plugin/webplugin_proxy.h46
5 files changed, 40 insertions, 37 deletions
diff --git a/content/plugin/plugin_channel.h b/content/plugin/plugin_channel.h
index c8665d9..27acc4c 100644
--- a/content/plugin/plugin_channel.h
+++ b/content/plugin/plugin_channel.h
@@ -33,18 +33,18 @@ class PluginChannel : public NPChannelBase {
virtual ~PluginChannel();
- virtual bool Send(IPC::Message* msg);
- virtual bool OnMessageReceived(const IPC::Message& message);
+ virtual bool Send(IPC::Message* msg) OVERRIDE;
+ virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
base::ProcessHandle renderer_handle() const { return renderer_handle_; }
int renderer_id() { return renderer_id_; }
- virtual int GenerateRouteID();
+ virtual int GenerateRouteID() OVERRIDE;
// Returns the event that's set when a call to the renderer causes a modal
// dialog to come up.
virtual base::WaitableEvent* GetModalDialogEvent(
- gfx::NativeViewId containing_window);
+ gfx::NativeViewId containing_window) OVERRIDE;
bool in_send() { return in_send_ != 0; }
@@ -62,12 +62,12 @@ class PluginChannel : public NPChannelBase {
virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
virtual void OnChannelError() OVERRIDE;
- virtual void CleanUp();
+ virtual void CleanUp() OVERRIDE;
// Overrides NPChannelBase::Init.
virtual bool Init(base::MessageLoopProxy* ipc_message_loop,
bool create_pipe_now,
- base::WaitableEvent* shutdown_event);
+ base::WaitableEvent* shutdown_event) OVERRIDE;
private:
class MessageFilter;
@@ -75,7 +75,7 @@ class PluginChannel : public NPChannelBase {
// Called on the plugin thread
PluginChannel();
- virtual bool OnControlMessageReceived(const IPC::Message& msg);
+ virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE;
static NPChannelBase* ClassFactory() { return new PluginChannel(); }
diff --git a/content/plugin/plugin_thread.h b/content/plugin/plugin_thread.h
index 1a1183b..0143acf 100644
--- a/content/plugin/plugin_thread.h
+++ b/content/plugin/plugin_thread.h
@@ -29,7 +29,7 @@ class PluginThread : public ChildThread {
static PluginThread* current();
private:
- virtual bool OnControlMessageReceived(const IPC::Message& msg);
+ virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE;
// Callback for when a channel has been created.
void OnCreateChannel(int renderer_id, bool incognito);
diff --git a/content/plugin/webplugin_accelerated_surface_proxy_mac.h b/content/plugin/webplugin_accelerated_surface_proxy_mac.h
index d3ad9ec..f0290ba 100644
--- a/content/plugin/webplugin_accelerated_surface_proxy_mac.h
+++ b/content/plugin/webplugin_accelerated_surface_proxy_mac.h
@@ -6,6 +6,7 @@
#define CONTENT_PLUGIN_WEBPLUGIN_ACCELERATED_SURFACE_PROXY_H_
#pragma once
+#include "base/compiler_specific.h"
#include "ui/gfx/gl/gpu_preference.h"
#include "webkit/plugins/npapi/webplugin_accelerated_surface_mac.h"
@@ -24,11 +25,11 @@ class WebPluginAcceleratedSurfaceProxy
virtual ~WebPluginAcceleratedSurfaceProxy();
// WebPluginAcceleratedSurface implementation.
- virtual void SetWindowHandle(gfx::PluginWindowHandle window);
- virtual void SetSize(const gfx::Size& size);
- virtual CGLContextObj context();
- virtual void StartDrawing();
- virtual void EndDrawing();
+ virtual void SetWindowHandle(gfx::PluginWindowHandle window) OVERRIDE;
+ virtual void SetSize(const gfx::Size& size) OVERRIDE;
+ virtual CGLContextObj context() OVERRIDE;
+ virtual void StartDrawing() OVERRIDE;
+ virtual void EndDrawing() OVERRIDE;
private:
WebPluginProxy* plugin_proxy_; // Weak ref.
diff --git a/content/plugin/webplugin_delegate_stub.h b/content/plugin/webplugin_delegate_stub.h
index 669abcc..981febb 100644
--- a/content/plugin/webplugin_delegate_stub.h
+++ b/content/plugin/webplugin_delegate_stub.h
@@ -44,10 +44,10 @@ class WebPluginDelegateStub : public IPC::Channel::Listener,
PluginChannel* channel);
// IPC::Channel::Listener implementation:
- virtual bool OnMessageReceived(const IPC::Message& msg);
+ virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
// IPC::Message::Sender implementation:
- virtual bool Send(IPC::Message* msg);
+ virtual bool Send(IPC::Message* msg) OVERRIDE;
int instance_id() { return instance_id_; }
WebPluginProxy* webplugin() { return webplugin_; }
diff --git a/content/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h
index dbc33b0..2ee39c1 100644
--- a/content/plugin/webplugin_proxy.h
+++ b/content/plugin/webplugin_proxy.h
@@ -58,28 +58,29 @@ class WebPluginProxy : public webkit::npapi::WebPlugin {
void set_delegate(webkit::npapi::WebPluginDelegateImpl* d) { delegate_ = d; }
// WebPlugin overrides
- virtual void SetWindow(gfx::PluginWindowHandle window);
+ virtual void SetWindow(gfx::PluginWindowHandle window) OVERRIDE;
// Whether input events should be sent to the delegate.
- virtual void SetAcceptsInputEvents(bool accepts);
+ virtual void SetAcceptsInputEvents(bool accepts) OVERRIDE;
- virtual void WillDestroyWindow(gfx::PluginWindowHandle window);
+ virtual void WillDestroyWindow(gfx::PluginWindowHandle window) OVERRIDE;
#if defined(OS_WIN)
void SetWindowlessPumpEvent(HANDLE pump_messages_event);
void ReparentPluginWindow(HWND window, HWND parent);
#endif
- virtual void CancelResource(unsigned long id);
- virtual void Invalidate();
- virtual void InvalidateRect(const gfx::Rect& rect);
- virtual NPObject* GetWindowScriptNPObject();
- virtual NPObject* GetPluginElement();
- virtual bool FindProxyForUrl(const GURL& url, std::string* proxy_list);
+ virtual void CancelResource(unsigned long id) OVERRIDE;
+ virtual void Invalidate() OVERRIDE;
+ virtual void InvalidateRect(const gfx::Rect& rect) OVERRIDE;
+ virtual NPObject* GetWindowScriptNPObject() OVERRIDE;
+ virtual NPObject* GetPluginElement() OVERRIDE;
+ virtual bool FindProxyForUrl(const GURL& url,
+ std::string* proxy_list) OVERRIDE;
virtual void SetCookie(const GURL& url,
const GURL& first_party_for_cookies,
- const std::string& cookie);
+ const std::string& cookie) OVERRIDE;
virtual std::string GetCookies(const GURL& url,
- const GURL& first_party_for_cookies);
+ const GURL& first_party_for_cookies) OVERRIDE;
// class-specific methods
@@ -112,7 +113,7 @@ class WebPluginProxy : public webkit::npapi::WebPlugin {
unsigned int len,
int notify_id,
bool popups_allowed,
- bool notify_redirects);
+ bool notify_redirects) OVERRIDE;
void UpdateGeometry(const gfx::Rect& window_rect,
const gfx::Rect& clip_rect,
const TransportDIB::Handle& windowless_buffer0,
@@ -120,24 +121,25 @@ class WebPluginProxy : public webkit::npapi::WebPlugin {
int windowless_buffer_index,
const TransportDIB::Handle& background_buffer,
bool transparent);
- virtual void CancelDocumentLoad();
+ virtual void CancelDocumentLoad() OVERRIDE;
virtual void InitiateHTTPRangeRequest(
- const char* url, const char* range_info, int range_request_id);
- virtual void SetDeferResourceLoading(unsigned long resource_id, bool defer);
- virtual bool IsOffTheRecord();
+ const char* url, const char* range_info, int range_request_id) OVERRIDE;
+ virtual void SetDeferResourceLoading(unsigned long resource_id,
+ bool defer) OVERRIDE;
+ virtual bool IsOffTheRecord() OVERRIDE;
virtual void ResourceClientDeleted(
- webkit::npapi::WebPluginResourceClient* resource_client);
+ webkit::npapi::WebPluginResourceClient* resource_client) OVERRIDE;
gfx::NativeViewId containing_window() { return containing_window_; }
#if defined(OS_MACOSX)
- virtual void FocusChanged(bool focused);
+ virtual void FocusChanged(bool focused) OVERRIDE;
- virtual void StartIme();
+ virtual void StartIme() OVERRIDE;
- virtual void BindFakePluginWindowHandle(bool opaque);
+ virtual void BindFakePluginWindowHandle(bool opaque) OVERRIDE;
virtual webkit::npapi::WebPluginAcceleratedSurface*
- GetAcceleratedSurface(gfx::GpuPreference gpu_preference);
+ GetAcceleratedSurface(gfx::GpuPreference gpu_preference) OVERRIDE;
// Tell the browser (via the renderer) to invalidate because the
// accelerated buffers have changed.
@@ -168,7 +170,7 @@ class WebPluginProxy : public webkit::npapi::WebPlugin {
virtual void FreeSurfaceDIB(TransportDIB::Id dib_id);
#endif
- virtual void URLRedirectResponse(bool allow, int resource_id);
+ virtual void URLRedirectResponse(bool allow, int resource_id) OVERRIDE;
#if defined(OS_WIN) && !defined(USE_AURA)
// Retrieves the IME status from a windowless plug-in and sends it to a