Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Side by Side Diff: content/renderer/mus/render_widget_mus_connection.h

Issue 1891413002: mash: Convert OnWindowInputEventAck to use an enum for handled status (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missed a file Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_MUS_RENDER_WIDGET_MUS_CONNECTION_H_ 5 #ifndef CONTENT_RENDERER_MUS_RENDER_WIDGET_MUS_CONNECTION_H_
6 #define CONTENT_RENDERER_MUS_RENDER_WIDGET_MUS_CONNECTION_H_ 6 #define CONTENT_RENDERER_MUS_RENDER_WIDGET_MUS_CONNECTION_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/threading/thread_checker.h" 9 #include "base/threading/thread_checker.h"
10 #include "cc/output/output_surface.h" 10 #include "cc/output/output_surface.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 void OnInputEventAck(std::unique_ptr<InputEventAck> input_event_ack) override; 54 void OnInputEventAck(std::unique_ptr<InputEventAck> input_event_ack) override;
55 void NotifyInputEventHandled( 55 void NotifyInputEventHandled(
56 blink::WebInputEvent::Type handled_type) override; 56 blink::WebInputEvent::Type handled_type) override;
57 void SetInputHandler(RenderWidgetInputHandler* input_handler) override; 57 void SetInputHandler(RenderWidgetInputHandler* input_handler) override;
58 void UpdateTextInputState(ShowIme show_ime, 58 void UpdateTextInputState(ShowIme show_ime,
59 ChangeSource change_source) override; 59 ChangeSource change_source) override;
60 bool WillHandleGestureEvent(const blink::WebGestureEvent& event) override; 60 bool WillHandleGestureEvent(const blink::WebGestureEvent& event) override;
61 bool WillHandleMouseEvent(const blink::WebMouseEvent& event) override; 61 bool WillHandleMouseEvent(const blink::WebMouseEvent& event) override;
62 62
63 void OnConnectionLost(); 63 void OnConnectionLost();
64 void OnWindowInputEvent(std::unique_ptr<blink::WebInputEvent> input_event, 64 void OnWindowInputEvent(
65 const base::Callback<void(bool)>& ack); 65 std::unique_ptr<blink::WebInputEvent> input_event,
66 const base::Callback<void(mus::mojom::EventResult)>& ack);
66 67
67 const int routing_id_; 68 const int routing_id_;
68 RenderWidgetInputHandler* input_handler_; 69 RenderWidgetInputHandler* input_handler_;
69 std::unique_ptr<mus::WindowSurfaceBinding> window_surface_binding_; 70 std::unique_ptr<mus::WindowSurfaceBinding> window_surface_binding_;
70 scoped_refptr<CompositorMusConnection> compositor_mus_connection_; 71 scoped_refptr<CompositorMusConnection> compositor_mus_connection_;
71 72
72 base::Callback<void(bool)> pending_ack_; 73 base::Callback<void(mus::mojom::EventResult)> pending_ack_;
73 74
74 // Used to verify single threaded access. 75 // Used to verify single threaded access.
75 base::ThreadChecker thread_checker_; 76 base::ThreadChecker thread_checker_;
76 77
77 DISALLOW_COPY_AND_ASSIGN(RenderWidgetMusConnection); 78 DISALLOW_COPY_AND_ASSIGN(RenderWidgetMusConnection);
78 }; 79 };
79 80
80 } // namespace content 81 } // namespace content
81 82
82 #endif // CONTENT_RENDERER_MUS_RENDER_WIDGET_MUS_CONNECTION_H_ 83 #endif // CONTENT_RENDERER_MUS_RENDER_WIDGET_MUS_CONNECTION_H_
OLDNEW
« no previous file with comments | « content/renderer/mus/compositor_mus_connection_unittest.cc ('k') | content/renderer/mus/render_widget_mus_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698