Merge from Chromium at DEPS revision 261286
This commit was generated by merge_to_master.py.
Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
diff --git a/mojo/examples/aura_demo/window_tree_host_mojo.cc b/mojo/examples/aura_demo/window_tree_host_mojo.cc
index 4e94938..b266ca9 100644
--- a/mojo/examples/aura_demo/window_tree_host_mojo.cc
+++ b/mojo/examples/aura_demo/window_tree_host_mojo.cc
@@ -5,8 +5,8 @@
#include "mojo/examples/aura_demo/window_tree_host_mojo.h"
#include "mojo/examples/aura_demo/demo_context_factory.h"
-#include "mojo/public/bindings/allocation_scope.h"
#include "mojo/public/c/gles2/gles2.h"
+#include "mojo/public/cpp/bindings/allocation_scope.h"
#include "mojo/services/native_viewport/geometry_conversions.h"
#include "ui/aura/env.h"
#include "ui/aura/window.h"
@@ -166,10 +166,8 @@
base::MessageLoop::current()->Quit();
}
-void WindowTreeHostMojo::OnEvent(const Event& event) {
- if (!event.location().is_null())
- native_viewport_->AckEvent(event);
-
+void WindowTreeHostMojo::OnEvent(const Event& event,
+ const mojo::Callback<void()>& callback) {
switch (event.action()) {
case ui::ET_MOUSE_PRESSED:
case ui::ET_MOUSE_DRAGGED:
@@ -194,6 +192,7 @@
}
// TODO(beng): touch, etc.
}
+ callback.Run();
};
} // namespace examples