Cleans up events to just the parts we're actually using

services/native_viewport/platform_viewport_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/native_viewport/platform_viewport_android.h"
 
 #include <android/input.h>
 #include <android/native_window_jni.h>
 
 #include "base/android/jni_android.h"
 #include "jni/PlatformViewportAndroid_jni.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
+#include "mojo/converters/input_events/input_events_type_converters.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_code_conversion_android.h"
 #include "ui/gfx/point.h"
 
 namespace native_viewport {
 namespace {
 
 ui::EventType MotionEventActionToEventType(jint action) {
   switch (action) {
     case AMOTION_EVENT_ACTION_DOWN:
@@ skipping 79 matching lines @@
 bool PlatformViewportAndroid::TouchEvent(JNIEnv* env, jobject obj,
                                          jint pointer_id,
                                          jint action_and_index,
                                          jfloat x, jfloat y,
                                          jlong time_ms) {
   gfx::Point location(static_cast<int>(x), static_cast<int>(y));
   jint action = action_and_index & AMOTION_EVENT_ACTION_MASK;
   ui::TouchEvent event(MotionEventActionToEventType(action), location,
                        id_generator_.GetGeneratedID(pointer_id),
                        base::TimeDelta::FromMilliseconds(time_ms));
-  // TODO(beng): handle multiple touch-points.
-  delegate_->OnEvent(&event);
+  // TODO(sky): handle multiple touch-points.
+  delegate_->OnEvent(mojo::Event::From(static_cast<ui::Event&>(event)));
   if (event.type() == ui::ET_TOUCH_RELEASED ||
       event.type() == ui::ET_TOUCH_CANCELLED)
     id_generator_.ReleaseNumber(pointer_id);
 
   return true;
 }
 
 bool PlatformViewportAndroid::KeyEvent(JNIEnv* env,
                                        jobject obj,
                                        bool pressed,
                                        jint key_code,
                                        jint unicode_character) {
   ui::KeyEvent event(pressed ? ui::ET_KEY_PRESSED : ui::ET_KEY_RELEASED,
                      ui::KeyboardCodeFromAndroidKeyCode(key_code), 0);
   event.set_platform_keycode(key_code);
-  delegate_->OnEvent(&event);
+  delegate_->OnEvent(mojo::Event::From(event));
   if (pressed && unicode_character) {
     ui::KeyEvent char_event(unicode_character,
                             ui::KeyboardCodeFromAndroidKeyCode(key_code), 0);
     char_event.set_platform_keycode(key_code);
-    delegate_->OnEvent(&char_event);
+    delegate_->OnEvent(mojo::Event::From(char_event));
   }
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformViewportAndroid, PlatformViewport implementation:
 
 void PlatformViewportAndroid::Init(const gfx::Rect& bounds) {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_PlatformViewportAndroid_createForActivity(
@@ skipping 18 matching lines @@
 }
 
 gfx::Size PlatformViewportAndroid::GetSize() {
   return metrics_->size.To<gfx::Size>();
 }
 
 void PlatformViewportAndroid::SetBounds(const gfx::Rect& bounds) {
   NOTIMPLEMENTED();
 }
 
-void PlatformViewportAndroid::SetCapture() {
-}
-
-void PlatformViewportAndroid::ReleaseCapture() {
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformViewportAndroid, private:
 
 void PlatformViewportAndroid::ReleaseWindow() {
   ANativeWindow_release(window_);
   window_ = NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformViewport, public:
 
 // static
 scoped_ptr<PlatformViewport> PlatformViewport::Create(Delegate* delegate) {
   return scoped_ptr<PlatformViewport>(
       new PlatformViewportAndroid(delegate)).Pass();
 }
 
 }  // namespace native_viewport