diff options
| author | jonross <jonross@chromium.org> | 2016-03-14 10:26:01 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-14 17:27:12 +0000 |
| commit | 1f99414fbab3db8b8b41c776e9709060cd14428a (patch) | |
| tree | 4609e6bc80acd87e47c85fa2b5611fdef80381ca /content/renderer/mus/render_widget_mus_connection.h | |
| parent | 6a0b409aaf12bf3f14640be52c0c25011a4c9792 (diff) | |
| download | chromium_src-1f99414fbab3db8b8b41c776e9709060cd14428a.zip chromium_src-1f99414fbab3db8b8b41c776e9709060cd14428a.tar.gz chromium_src-1f99414fbab3db8b8b41c776e9709060cd14428a.tar.bz2 | |
This change relands (https://codereview.chromium.org/1749323002/)
Revert "Revert of Update WindowTree::OnWindowInputEventAck to include handled (patchset #4 id:60001 of https://codereview.chromium.org/1749323002/ )"
This reverts commit ce1b6c89699ef3d9b0834c0d840c2de0205517a4.
This also fixes a compilation error on Windows of content_unittests.
TBR=sky@chromium.org
TBR=ben@chromium.org
TBR=tdresser@chromium.org
TEST=WindowTreeClientImplTest, WindowTreeApptest, WindowTreeTest, CompositorMusConnectionTest
BUG=560478
Review URL: https://codereview.chromium.org/1784323002
Cr-Commit-Position: refs/heads/master@{#380995}
Diffstat (limited to 'content/renderer/mus/render_widget_mus_connection.h')
| -rw-r--r-- | content/renderer/mus/render_widget_mus_connection.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/renderer/mus/render_widget_mus_connection.h b/content/renderer/mus/render_widget_mus_connection.h index bd8572b..3e3fc29 100644 --- a/content/renderer/mus/render_widget_mus_connection.h +++ b/content/renderer/mus/render_widget_mus_connection.h @@ -35,6 +35,7 @@ class CONTENT_EXPORT RenderWidgetMusConnection private: friend class CompositorMusConnection; + friend class CompositorMusConnectionTest; explicit RenderWidgetMusConnection(int routing_id); ~RenderWidgetMusConnection() override; @@ -61,14 +62,14 @@ class CONTENT_EXPORT RenderWidgetMusConnection void OnConnectionLost(); void OnWindowInputEvent(scoped_ptr<blink::WebInputEvent> input_event, - const base::Closure& ack); + const base::Callback<void(bool)>& ack); const int routing_id_; RenderWidgetInputHandler* input_handler_; scoped_ptr<mus::WindowSurfaceBinding> window_surface_binding_; scoped_refptr<CompositorMusConnection> compositor_mus_connection_; - base::Closure pending_ack_; + base::Callback<void(bool)> pending_ack_; // Used to verify single threaded access. base::ThreadChecker thread_checker_; |