| Index: content/browser/renderer_host/render_widget_host_view_aura.h
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
|
| index bc2ad37a2f858a18c073c158fe2d2c3e3c8ef49d..448e0d0d2a856d8ce3059fbc7c97a7f4e734c33e 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.h
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.h
|
| @@ -77,6 +77,10 @@ namespace content {
|
| class LegacyRenderWidgetHostHWND;
|
| #endif
|
|
|
| +#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
| +class KeybindingHandlerAuraX11;
|
| +#endif
|
| +
|
| class RenderWidgetHostImpl;
|
| class RenderWidgetHostView;
|
| class ResizeLock;
|
| @@ -422,6 +426,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
| virtual gfx::Point GetLastTouchEventLocation() const OVERRIDE;
|
| virtual void FatalAccessibilityTreeError() OVERRIDE;
|
|
|
| + void DoSharedInit();
|
| +
|
| void UpdateCursorIfOverSelf();
|
| bool ShouldSkipFrame(gfx::Size size_in_dip) const;
|
|
|
| @@ -518,6 +524,11 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
| // Detaches |this| from the input method object.
|
| void DetachFromInputMethod();
|
|
|
| + // Before calling RenderWidgetHost::ForwardKeyboardEvent(), this method
|
| + // calls our keybindings handler against the event and send matched
|
| + // edit commands to renderer instead.
|
| + void ForwardKeyboardEvent(const NativeWebKeyboardEvent& event);
|
| +
|
| // Dismisses a Web Popup on a mouse or touch press outside the popup and its
|
| // parent.
|
| void ApplyEventFilterForPopupExit(ui::LocatedEvent* event);
|
| @@ -755,6 +766,10 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
| // over this view changes, we need this information in order to create a new
|
| // region for the HWND.
|
| PluginWindowMoves plugin_window_moves_;
|
| +#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
| + // A convenience object for handling editor key bindings defined in gtk
|
| + // keyboard theme.
|
| + scoped_ptr<KeybindingHandlerAuraX11> key_bindings_handler_;
|
| #endif
|
|
|
| base::TimeTicks last_draw_ended_;
|
|
|