diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-17 20:52:18 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-17 20:52:18 +0000 |
| commit | 11963f6434c2049c1937617ea18969a496c6216e (patch) | |
| tree | 2a223075d498d0fb0333791a3c696ef678cf1abc /chrome/renderer/render_view.h | |
| parent | e0e5ec3b07e3bc676055321bbb3985a801011719 (diff) | |
| download | chromium_src-11963f6434c2049c1937617ea18969a496c6216e.zip chromium_src-11963f6434c2049c1937617ea18969a496c6216e.tar.gz chromium_src-11963f6434c2049c1937617ea18969a496c6216e.tar.bz2 | |
Extend improved windowless plugin focus handling to all platforms
Uses the same two-state focus tracking that the Mac currently uses on Windows and Linux as well, so focus is updated correctly when the content area itself gains and loses focus.
BUG=55607
TEST=Windowless plugins should handle key events when focused on all platforms.
Review URL: http://codereview.chromium.org/3418016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59845 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_view.h')
| -rw-r--r-- | chrome/renderer/render_view.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index 0013ee9..01f9655 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -318,10 +318,10 @@ class RenderView : public RenderWidget, int32 height, TransportDIB::Handle transport_dib); void AcceleratedSurfaceBuffersSwapped(gfx::PluginWindowHandle window); +#endif void RegisterPluginDelegate(WebPluginDelegateProxy* delegate); void UnregisterPluginDelegate(WebPluginDelegateProxy* delegate); -#endif // IPC::Channel::Listener implementation ------------------------------------- @@ -610,9 +610,8 @@ class RenderView : public RenderWidget, virtual void DidFlushPaint(); virtual void DidHandleKeyEvent(); virtual void DidHandleMouseEvent(const WebKit::WebMouseEvent& event); - -#if OS_MACOSX virtual void OnSetFocus(bool enable); +#if OS_MACOSX virtual void OnWasHidden(); virtual void OnWasRestored(bool needs_repainting); #endif @@ -1218,12 +1217,10 @@ class RenderView : public RenderWidget, PepperPluginDelegateImpl pepper_delegate_; -#if defined(OS_MACOSX) // All the currently active plugin delegates for this RenderView; kept so that // we can enumerate them to send updates about things like window location // or tab focus and visibily. These are non-owning references. std::set<WebPluginDelegateProxy*> plugin_delegates_; -#endif // A list of all Pepper v1 plugins that we've created that haven't been // destroyed yet. Pepper v2 plugins are tracked by the pepper_delegate_. |