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 "window_android.h" | 5 #include "ui/gfx/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_helper.h" | 8 #include "base/android/jni_helper.h" |
9 #include "base/android/scoped_java_ref.h" | 9 #include "base/android/scoped_java_ref.h" |
10 #include "jni/NativeWindow_jni.h" | 10 #include "jni/WindowAndroid_jni.h" |
11 | 11 |
12 namespace ui { | 12 namespace ui { |
13 | 13 |
14 using base::android::AttachCurrentThread; | 14 using base::android::AttachCurrentThread; |
15 using base::android::ScopedJavaLocalRef; | 15 using base::android::ScopedJavaLocalRef; |
16 | 16 |
17 WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj) | 17 WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj) |
18 : weak_java_window_(env, obj) { | 18 : weak_java_window_(env, obj) { |
19 } | 19 } |
20 | 20 |
(...skipping 16 matching lines...) Expand all Loading... |
37 // ---------------------------------------------------------------------------- | 37 // ---------------------------------------------------------------------------- |
38 // Native JNI methods | 38 // Native JNI methods |
39 // ---------------------------------------------------------------------------- | 39 // ---------------------------------------------------------------------------- |
40 | 40 |
41 jint Init(JNIEnv* env, jobject obj) { | 41 jint Init(JNIEnv* env, jobject obj) { |
42 WindowAndroid* window = new WindowAndroid(env, obj); | 42 WindowAndroid* window = new WindowAndroid(env, obj); |
43 return reinterpret_cast<jint>(window); | 43 return reinterpret_cast<jint>(window); |
44 } | 44 } |
45 | 45 |
46 } // namespace ui | 46 } // namespace ui |
OLD | NEW |