| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "ui/android/window_android.h" | 5 #include "ui/base/android/window_android.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_array.h" | 8 #include "base/android/jni_array.h" |
| 9 #include "base/android/jni_helper.h" | 9 #include "base/android/jni_helper.h" |
| 10 #include "base/android/scoped_java_ref.h" | 10 #include "base/android/scoped_java_ref.h" |
| 11 #include "jni/WindowAndroid_jni.h" | 11 #include "jni/WindowAndroid_jni.h" |
| 12 | 12 |
| 13 namespace ui { | 13 namespace ui { |
| 14 | 14 |
| 15 using base::android::AttachCurrentThread; | 15 using base::android::AttachCurrentThread; |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 // ---------------------------------------------------------------------------- | 53 // ---------------------------------------------------------------------------- |
| 54 // Native JNI methods | 54 // Native JNI methods |
| 55 // ---------------------------------------------------------------------------- | 55 // ---------------------------------------------------------------------------- |
| 56 | 56 |
| 57 jint Init(JNIEnv* env, jobject obj) { | 57 jint Init(JNIEnv* env, jobject obj) { |
| 58 WindowAndroid* window = new WindowAndroid(env, obj); | 58 WindowAndroid* window = new WindowAndroid(env, obj); |
| 59 return reinterpret_cast<jint>(window); | 59 return reinterpret_cast<jint>(window); |
| 60 } | 60 } |
| 61 | 61 |
| 62 } // namespace ui | 62 } // namespace ui |
| OLD | NEW |