Index: content/plugin/webplugin_proxy.h |
diff --git a/content/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h |
index dbc33b0cd9f2cd0d3f520d4243bf1118b3a2ad7f..2ee39c1af75a26373c44417d7b438e87460c69a0 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 |