diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-17 21:30:57 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-17 21:30:57 +0000 |
| commit | 1b8a1b648148a058b2c03d89398a65038992732f (patch) | |
| tree | 6c30beecb179d5814d8e9a648835084072d018d7 /chrome/renderer/render_view.h | |
| parent | 2043a10953fd492c05db54bf83d2a4f16906429a (diff) | |
| download | chromium_src-1b8a1b648148a058b2c03d89398a65038992732f.zip chromium_src-1b8a1b648148a058b2c03d89398a65038992732f.tar.gz chromium_src-1b8a1b648148a058b2c03d89398a65038992732f.tar.bz2 | |
Revert 59845 - 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
TBR=stuartmorgan@chromium.org
Review URL: http://codereview.chromium.org/3457007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59852 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, 5 insertions, 2 deletions
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index 01f9655..0013ee9 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,8 +610,9 @@ class RenderView : public RenderWidget, virtual void DidFlushPaint(); virtual void DidHandleKeyEvent(); virtual void DidHandleMouseEvent(const WebKit::WebMouseEvent& event); - virtual void OnSetFocus(bool enable); + #if OS_MACOSX + virtual void OnSetFocus(bool enable); virtual void OnWasHidden(); virtual void OnWasRestored(bool needs_repainting); #endif @@ -1217,10 +1218,12 @@ 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_. |