| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/android/window_android.h" |
| 6 | 6 |
| 7 #include "base/android/context_utils.h" |
| 7 #include "base/android/jni_android.h" | 8 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_array.h" | 9 #include "base/android/jni_array.h" |
| 9 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
| 10 #include "base/android/jni_weak_ref.h" | 11 #include "base/android/jni_weak_ref.h" |
| 11 #include "base/android/scoped_java_ref.h" | 12 #include "base/android/scoped_java_ref.h" |
| 12 #include "jni/WindowAndroid_jni.h" | 13 #include "jni/WindowAndroid_jni.h" |
| 13 #include "ui/android/window_android_compositor.h" | 14 #include "ui/android/window_android_compositor.h" |
| 14 #include "ui/android/window_android_observer.h" | 15 #include "ui/android/window_android_observer.h" |
| 15 | 16 |
| 16 namespace ui { | 17 namespace ui { |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 // ---------------------------------------------------------------------------- | 143 // ---------------------------------------------------------------------------- |
| 143 // Native JNI methods | 144 // Native JNI methods |
| 144 // ---------------------------------------------------------------------------- | 145 // ---------------------------------------------------------------------------- |
| 145 | 146 |
| 146 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 147 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
| 147 WindowAndroid* window = new WindowAndroid(env, obj); | 148 WindowAndroid* window = new WindowAndroid(env, obj); |
| 148 return reinterpret_cast<intptr_t>(window); | 149 return reinterpret_cast<intptr_t>(window); |
| 149 } | 150 } |
| 150 | 151 |
| 151 } // namespace ui | 152 } // namespace ui |
| OLD | NEW |