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

Unified Diff: components/mus/ws/window_tree_client_unittest.cc

Issue 1939133002: StructTraits to map mus::mojom::Event to unique_ptr<ui::Event> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed feedback. Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/mus/ws/window_tree.cc ('k') | components/mus/ws/window_tree_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/ws/window_tree_client_unittest.cc
diff --git a/components/mus/ws/window_tree_client_unittest.cc b/components/mus/ws/window_tree_client_unittest.cc
index ca36b907bb5dea900b9a0403d072061bd4ac095f..d8a1e40f0fb0155d62ccd56aa1e5d77783005dfd 100644
--- a/components/mus/ws/window_tree_client_unittest.cc
+++ b/components/mus/ws/window_tree_client_unittest.cc
@@ -25,7 +25,6 @@ using mojo::InterfaceRequest;
using shell::ShellClient;
using mojo::String;
using mus::mojom::ErrorCode;
-using mus::mojom::EventPtr;
using mus::mojom::WindowDataPtr;
using mus::mojom::WindowTree;
using mus::mojom::WindowTreeClient;
@@ -349,7 +348,7 @@ class TestWindowTreeClient : public mojom::WindowTreeClient,
}
void OnWindowInputEvent(uint32_t event_id,
Id window_id,
- EventPtr event,
+ std::unique_ptr<ui::Event> event,
uint32_t event_observer_id) override {
// Ack input events to clear the state on the server. These can be received
// during test startup. X11Window::DispatchEvent sends a synthetic move
@@ -358,7 +357,8 @@ class TestWindowTreeClient : public mojom::WindowTreeClient,
// Don't log input events as none of the tests care about them and they
// may come in at random points.
}
- void OnEventObserved(EventPtr event, uint32_t event_observer_id) override {}
+ void OnEventObserved(std::unique_ptr<ui::Event>,
+ uint32_t event_observer_id) override {}
void OnWindowSharedPropertyChanged(uint32_t window,
const String& name,
Array<uint8_t> new_data) override {
@@ -408,7 +408,7 @@ class TestWindowTreeClient : public mojom::WindowTreeClient,
bool janky) override {
NOTIMPLEMENTED();
}
- void OnAccelerator(uint32_t id, mojom::EventPtr event) override {
+ void OnAccelerator(uint32_t id, std::unique_ptr<ui::Event> event) override {
NOTIMPLEMENTED();
}
« no previous file with comments | « components/mus/ws/window_tree.cc ('k') | components/mus/ws/window_tree_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698