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/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_string.h" | 9 #include "base/android/jni_string.h" |
10 #include "base/android/jni_weak_ref.h" | 10 #include "base/android/jni_weak_ref.h" |
(...skipping 20 matching lines...) Expand all Loading... |
31 } | 31 } |
32 | 32 |
33 bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) { | 33 bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) { |
34 return RegisterNativesImpl(env); | 34 return RegisterNativesImpl(env); |
35 } | 35 } |
36 | 36 |
37 WindowAndroid::~WindowAndroid() { | 37 WindowAndroid::~WindowAndroid() { |
38 DCHECK(!compositor_); | 38 DCHECK(!compositor_); |
39 } | 39 } |
40 | 40 |
| 41 WindowAndroid* WindowAndroid::createForTesting() { |
| 42 JNIEnv* env = AttachCurrentThread(); |
| 43 jobject context = base::android::GetApplicationContext(); |
| 44 return new WindowAndroid( |
| 45 env, Java_WindowAndroid_createForTesting(env, context).obj()); |
| 46 } |
| 47 |
41 void WindowAndroid::OnCompositingDidCommit() { | 48 void WindowAndroid::OnCompositingDidCommit() { |
42 FOR_EACH_OBSERVER(WindowAndroidObserver, | 49 FOR_EACH_OBSERVER(WindowAndroidObserver, |
43 observer_list_, | 50 observer_list_, |
44 OnCompositingDidCommit()); | 51 OnCompositingDidCommit()); |
45 } | 52 } |
46 | 53 |
47 void WindowAndroid::AddObserver(WindowAndroidObserver* observer) { | 54 void WindowAndroid::AddObserver(WindowAndroidObserver* observer) { |
48 if (!observer_list_.HasObserver(observer)) | 55 if (!observer_list_.HasObserver(observer)) |
49 observer_list_.AddObserver(observer); | 56 observer_list_.AddObserver(observer); |
50 } | 57 } |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 // ---------------------------------------------------------------------------- | 142 // ---------------------------------------------------------------------------- |
136 // Native JNI methods | 143 // Native JNI methods |
137 // ---------------------------------------------------------------------------- | 144 // ---------------------------------------------------------------------------- |
138 | 145 |
139 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 146 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
140 WindowAndroid* window = new WindowAndroid(env, obj); | 147 WindowAndroid* window = new WindowAndroid(env, obj); |
141 return reinterpret_cast<intptr_t>(window); | 148 return reinterpret_cast<intptr_t>(window); |
142 } | 149 } |
143 | 150 |
144 } // namespace ui | 151 } // namespace ui |
OLD | NEW |