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/base/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_weak_ref.h" | 9 #include "base/android/jni_weak_ref.h" |
10 #include "base/android/scoped_java_ref.h" | 10 #include "base/android/scoped_java_ref.h" |
11 #include "base/bind.h" | |
11 #include "jni/WindowAndroid_jni.h" | 12 #include "jni/WindowAndroid_jni.h" |
13 #include "ui/base/android/system_ui_resource_layer.h" | |
jdduke (slow)
2014/07/12 01:01:09
Do we still need these inclusions?
powei
2014/07/16 17:10:52
Done. Removed
| |
14 #include "ui/base/android/ui_resource_client_android.h" | |
12 #include "ui/base/android/window_android_compositor.h" | 15 #include "ui/base/android/window_android_compositor.h" |
13 #include "ui/base/android/window_android_observer.h" | 16 #include "ui/base/android/window_android_observer.h" |
14 | 17 |
15 namespace ui { | 18 namespace ui { |
16 | 19 |
17 using base::android::AttachCurrentThread; | 20 using base::android::AttachCurrentThread; |
18 using base::android::ScopedJavaLocalRef; | 21 using base::android::ScopedJavaLocalRef; |
19 | 22 |
20 WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj, jlong vsync_period) | 23 WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj, jlong vsync_period) |
21 : weak_java_window_(env, obj), | 24 : weak_java_window_(env, obj), |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
100 // ---------------------------------------------------------------------------- | 103 // ---------------------------------------------------------------------------- |
101 // Native JNI methods | 104 // Native JNI methods |
102 // ---------------------------------------------------------------------------- | 105 // ---------------------------------------------------------------------------- |
103 | 106 |
104 jlong Init(JNIEnv* env, jobject obj, jlong vsync_period) { | 107 jlong Init(JNIEnv* env, jobject obj, jlong vsync_period) { |
105 WindowAndroid* window = new WindowAndroid(env, obj, vsync_period); | 108 WindowAndroid* window = new WindowAndroid(env, obj, vsync_period); |
106 return reinterpret_cast<intptr_t>(window); | 109 return reinterpret_cast<intptr_t>(window); |
107 } | 110 } |
108 | 111 |
109 } // namespace ui | 112 } // namespace ui |
OLD | NEW |