| Index: content/browser/android/content_view_core_impl.h
|
| diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
|
| index b9edb67eae1fc0aa0c54daae722eacfc03caf19b..24a73735eba83e0b2d6de0e8744fae0ba8d89d71 100644
|
| --- a/content/browser/android/content_view_core_impl.h
|
| +++ b/content/browser/android/content_view_core_impl.h
|
| @@ -33,7 +33,7 @@ class WindowAndroid;
|
|
|
| namespace content {
|
| class RenderWidgetHostViewAndroid;
|
| -class SyncInputEventFilter;
|
| +class SynchronousInputEventFilter;
|
|
|
| // TODO(jrg): this is a shell. Upstream the rest.
|
| class ContentViewCoreImpl : public ContentViewCore,
|
| @@ -62,6 +62,8 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| virtual float GetDpiScale() const OVERRIDE;
|
| virtual void RequestContentClipping(const gfx::Rect& clipping,
|
| const gfx::Size& content_size) OVERRIDE;
|
| + virtual void SetInputEventFilter(
|
| + SynchronousInputEventFilter* input_event_filter) OVERRIDE;
|
| virtual void AddFrameInfoCallback(
|
| const UpdateFrameInfoCallback& callback) OVERRIDE;
|
| virtual void RemoveFrameInfoCallback(
|
| @@ -362,7 +364,7 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| std::vector<UpdateFrameInfoCallback> update_frame_info_callbacks_;
|
|
|
| // Optional browser-side input event filtering.
|
| - scoped_ptr<SyncInputEventFilter> input_event_filter_;
|
| + SynchronousInputEventFilter* input_event_filter_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
|
| };
|
|
|