NOT FOR REVIEW: Aura on Android

ui/platform_window/android/platform_window_android.cc

 // Copyright 2015 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 "ui/platform_window/android/platform_window_android.h"
 
 #include <android/input.h>
 #include <android/native_window_jni.h>
 
 #include "base/android/jni_android.h"
 #include "jni/PlatformWindowAndroid_jni.h"
+#include "ui/base/ime/input_method.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_code_conversion_android.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/platform_window/platform_window_delegate.h"
 
 namespace ui {
 
 namespace {
 
 ui::EventType MotionEventActionToEventType(jint action) {
@@ skipping 56 matching lines @@
                                            float device_pixel_ratio) {
   base::android::ScopedJavaLocalRef<jobject> protector(env, jsurface);
   // Note: This ensures that any local references used by
   // ANativeWindow_fromSurface are released immediately. This is needed as a
   // workaround for https://code.google.com/p/android/issues/detail?id=68174
   {
     base::android::ScopedJavaLocalFrame scoped_local_reference_frame(env);
     window_ = ANativeWindow_fromSurface(env, jsurface);
   }
   delegate_->OnAcceleratedWidgetAvailable(window_, device_pixel_ratio);
+  platform_ime_controller_.SetInputMethod(delegate_->GetInputMethod2());
 }
 
 void PlatformWindowAndroid::SurfaceDestroyed(JNIEnv* env, jobject obj) {
   DCHECK(window_);
   ReleaseWindow();
   delegate_->OnAcceleratedWidgetAvailable(gfx::kNullAcceleratedWidget, 0.f);
 }
 
 void PlatformWindowAndroid::SurfaceSetSize(JNIEnv* env,
                                            jobject obj,
@@ skipping 33 matching lines @@
                                      jint key_code,
                                      jint unicode_character) {
   ui::KeyEvent key_event(pressed ? ui::ET_KEY_PRESSED : ui::ET_KEY_RELEASED,
                          ui::KeyboardCodeFromAndroidKeyCode(key_code), 0);
   key_event.set_platform_keycode(key_code);
   delegate_->DispatchEvent(&key_event);
   if (pressed && unicode_character) {
     ui::KeyEvent char_event(unicode_character,
                             ui::KeyboardCodeFromAndroidKeyCode(key_code), 0);
     char_event.set_platform_keycode(key_code);
+    platform_ime_controller_.GetInputMethod()->DispatchKeyEvent(&char_event);
     delegate_->DispatchEvent(&char_event);
   }
   return true;
 }
 
+void PlatformWindowAndroid::FocusChanged(JNIEnv* env, jobject obj, bool gained_focus) {
+  delegate_->OnActivationChanged(gained_focus);
+}
+
 void PlatformWindowAndroid::ReleaseWindow() {
   ANativeWindow_release(window_);
   window_ = NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformWindowAndroid, PlatformWindow implementation:
 
 void PlatformWindowAndroid::Show() {
   if (!java_platform_window_android_.is_empty())
@@ skipping 56 matching lines @@
 
 void PlatformWindowAndroid::ConfineCursorToBounds(const gfx::Rect& bounds) {
   NOTIMPLEMENTED();
 }
 
 PlatformImeController* PlatformWindowAndroid::GetPlatformImeController() {
   return &platform_ime_controller_;
 }
 
 }  // namespace ui