| Index: content/child/npapi/webplugin.h
|
| ===================================================================
|
| --- content/child/npapi/webplugin.h (revision 222566)
|
| +++ content/child/npapi/webplugin.h (working copy)
|
| @@ -46,14 +46,7 @@
|
| // Called by the plugin delegate to let it know that the window is being
|
| // destroyed.
|
| virtual void WillDestroyWindow(gfx::PluginWindowHandle window) = 0;
|
| -#if defined(OS_WIN)
|
| - // |pump_messages_event| is a event handle which is used in NPP_HandleEvent
|
| - // calls to pump messages if the plugin enters a modal loop.
|
| - // |dummy_activation_window} is used to ensure correct keyboard activation.
|
| - // It needs to be a child of the parent window.
|
| - virtual void SetWindowlessData(HANDLE pump_messages_event,
|
| - gfx::NativeViewId dummy_activation_window) = 0;
|
| -#endif
|
| +
|
| // Cancels a pending request.
|
| virtual void CancelResource(unsigned long id) = 0;
|
| virtual void Invalidate() = 0;
|
| @@ -109,6 +102,23 @@
|
| virtual void SetDeferResourceLoading(unsigned long resource_id,
|
| bool defer) = 0;
|
|
|
| + // Handles NPN_URLRedirectResponse calls issued by plugins in response to
|
| + // HTTP URL redirect notifications.
|
| + virtual void URLRedirectResponse(bool allow, int resource_id) = 0;
|
| +
|
| + // Returns true if the new url is a secure transition. This is to catch a
|
| + // plugin src url transitioning from https to http.
|
| + virtual bool CheckIfRunInsecureContent(const GURL& url) = 0;
|
| +
|
| +#if defined(OS_WIN)
|
| + // |pump_messages_event| is a event handle which is used in NPP_HandleEvent
|
| + // calls to pump messages if the plugin enters a modal loop.
|
| + // |dummy_activation_window} is used to ensure correct keyboard activation.
|
| + // It needs to be a child of the parent window.
|
| + virtual void SetWindowlessData(HANDLE pump_messages_event,
|
| + gfx::NativeViewId dummy_activation_window) = 0;
|
| +#endif
|
| +
|
| #if defined(OS_MACOSX)
|
| // Called to inform the WebPlugin that the plugin has gained or lost focus.
|
| virtual void FocusChanged(bool focused) {}
|
| @@ -128,10 +138,6 @@
|
| uint32 surface_id) = 0;
|
| virtual void AcceleratedPluginSwappedIOSurface() = 0;
|
| #endif
|
| -
|
| - // Handles NPN_URLRedirectResponse calls issued by plugins in response to
|
| - // HTTP URL redirect notifications.
|
| - virtual void URLRedirectResponse(bool allow, int resource_id) = 0;
|
| };
|
|
|
| } // namespace content
|
|
|