| Index: content/plugin/webplugin_proxy.h
|
| diff --git a/content/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h
|
| index d419877511cdb461f71ed45655f4659288880f06..d9ae53d1ec5240ece6a6f01d959efffe652d29f6 100644
|
| --- a/content/plugin/webplugin_proxy.h
|
| +++ b/content/plugin/webplugin_proxy.h
|
| @@ -46,69 +46,67 @@ class WebPluginProxy : public WebPlugin,
|
| int route_id,
|
| const GURL& page_url,
|
| int host_render_view_routing_id);
|
| - virtual ~WebPluginProxy();
|
| + ~WebPluginProxy() override;
|
|
|
| void set_delegate(WebPluginDelegateImpl* d) { delegate_ = d; }
|
|
|
| // WebPlugin overrides
|
| - virtual void SetWindow(gfx::PluginWindowHandle window) override;
|
| - virtual void SetAcceptsInputEvents(bool accepts) override;
|
| - virtual void WillDestroyWindow(gfx::PluginWindowHandle window) override;
|
| - 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) override;
|
| - virtual std::string GetCookies(const GURL& url,
|
| - const GURL& first_party_for_cookies) override;
|
| - virtual void HandleURLRequest(const char* url,
|
| - const char* method,
|
| - const char* target,
|
| - const char* buf,
|
| - unsigned int len,
|
| - int notify_id,
|
| - bool popups_allowed,
|
| - bool notify_redirects) override;
|
| + void SetWindow(gfx::PluginWindowHandle window) override;
|
| + void SetAcceptsInputEvents(bool accepts) override;
|
| + void WillDestroyWindow(gfx::PluginWindowHandle window) override;
|
| + void CancelResource(unsigned long id) override;
|
| + void Invalidate() override;
|
| + void InvalidateRect(const gfx::Rect& rect) override;
|
| + NPObject* GetWindowScriptNPObject() override;
|
| + NPObject* GetPluginElement() override;
|
| + bool FindProxyForUrl(const GURL& url, std::string* proxy_list) override;
|
| + void SetCookie(const GURL& url,
|
| + const GURL& first_party_for_cookies,
|
| + const std::string& cookie) override;
|
| + std::string GetCookies(const GURL& url,
|
| + const GURL& first_party_for_cookies) override;
|
| + void HandleURLRequest(const char* url,
|
| + const char* method,
|
| + const char* target,
|
| + const char* buf,
|
| + unsigned int len,
|
| + int notify_id,
|
| + bool popups_allowed,
|
| + bool notify_redirects) override;
|
| void UpdateGeometry(const gfx::Rect& window_rect,
|
| const gfx::Rect& clip_rect,
|
| const TransportDIB::Handle& windowless_buffer0,
|
| const TransportDIB::Handle& windowless_buffer1,
|
| int windowless_buffer_index);
|
| - virtual void CancelDocumentLoad() override;
|
| - virtual void InitiateHTTPRangeRequest(
|
| - const char* url, const char* range_info, int range_request_id) override;
|
| - virtual void DidStartLoading() override;
|
| - virtual void DidStopLoading() override;
|
| - virtual void SetDeferResourceLoading(unsigned long resource_id,
|
| - bool defer) override;
|
| - virtual bool IsOffTheRecord() override;
|
| - virtual void ResourceClientDeleted(
|
| - WebPluginResourceClient* resource_client) override;
|
| - virtual void URLRedirectResponse(bool allow, int resource_id) override;
|
| - virtual bool CheckIfRunInsecureContent(const GURL& url) override;
|
| + void CancelDocumentLoad() override;
|
| + void InitiateHTTPRangeRequest(const char* url,
|
| + const char* range_info,
|
| + int range_request_id) override;
|
| + void DidStartLoading() override;
|
| + void DidStopLoading() override;
|
| + void SetDeferResourceLoading(unsigned long resource_id, bool defer) override;
|
| + bool IsOffTheRecord() override;
|
| + void ResourceClientDeleted(WebPluginResourceClient* resource_client) override;
|
| + void URLRedirectResponse(bool allow, int resource_id) override;
|
| + bool CheckIfRunInsecureContent(const GURL& url) override;
|
| #if defined(OS_WIN)
|
| void SetWindowlessData(HANDLE pump_messages_event,
|
| gfx::NativeViewId dummy_activation_window);
|
| #endif
|
| #if defined(OS_MACOSX)
|
| - virtual void FocusChanged(bool focused) override;
|
| - virtual void StartIme() override;
|
| - virtual WebPluginAcceleratedSurface*
|
| - GetAcceleratedSurface(gfx::GpuPreference gpu_preference) override;
|
| - virtual void AcceleratedPluginEnabledRendering() override;
|
| - virtual void AcceleratedPluginAllocatedIOSurface(int32 width,
|
| - int32 height,
|
| - uint32 surface_id) override;
|
| - virtual void AcceleratedPluginSwappedIOSurface() override;
|
| + void FocusChanged(bool focused) override;
|
| + void StartIme() override;
|
| + WebPluginAcceleratedSurface* GetAcceleratedSurface(
|
| + gfx::GpuPreference gpu_preference) override;
|
| + void AcceleratedPluginEnabledRendering() override;
|
| + void AcceleratedPluginAllocatedIOSurface(int32 width,
|
| + int32 height,
|
| + uint32 surface_id) override;
|
| + void AcceleratedPluginSwappedIOSurface() override;
|
| #endif
|
|
|
| // IPC::Sender implementation.
|
| - virtual bool Send(IPC::Message* msg) override;
|
| + bool Send(IPC::Message* msg) override;
|
|
|
| // class-specific methods
|
|
|
|
|