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/context_utils.h" |
8 #include "base/android/jni_android.h" | 8 #include "base/android/jni_android.h" |
9 #include "base/android/jni_array.h" | 9 #include "base/android/jni_array.h" |
10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
11 #include "base/android/jni_weak_ref.h" | 11 #include "base/android/jni_weak_ref.h" |
12 #include "base/android/scoped_java_ref.h" | 12 #include "base/android/scoped_java_ref.h" |
13 #include "jni/WindowAndroid_jni.h" | 13 #include "jni/WindowAndroid_jni.h" |
14 #include "ui/android/window_android_compositor.h" | 14 #include "ui/android/window_android_compositor.h" |
15 #include "ui/android/window_android_observer.h" | 15 #include "ui/android/window_android_observer.h" |
| 16 #include "ui/gfx/android/device_display_info.h" |
16 | 17 |
17 namespace ui { | 18 namespace ui { |
18 | 19 |
19 using base::android::AttachCurrentThread; | 20 using base::android::AttachCurrentThread; |
20 using base::android::ScopedJavaLocalRef; | 21 using base::android::ScopedJavaLocalRef; |
21 | 22 |
22 WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj) : compositor_(NULL) { | 23 WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj) |
23 java_window_.Reset(env, obj); | 24 : java_window_(env, obj), |
24 } | 25 compositor_(NULL), |
| 26 // TODO(gsennton) have our device display info depend on our (java) |
| 27 // display context |
| 28 device_display_info_(new gfx::DeviceDisplayInfo()) {} |
25 | 29 |
26 void WindowAndroid::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 30 void WindowAndroid::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
27 delete this; | 31 delete this; |
28 } | 32 } |
29 | 33 |
30 ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() { | 34 ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() { |
31 return base::android::ScopedJavaLocalRef<jobject>(java_window_); | 35 return base::android::ScopedJavaLocalRef<jobject>(java_window_); |
32 } | 36 } |
33 | 37 |
34 bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) { | 38 bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) { |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 } | 139 } |
136 | 140 |
137 bool WindowAndroid::CanRequestPermission(const std::string& permission) { | 141 bool WindowAndroid::CanRequestPermission(const std::string& permission) { |
138 JNIEnv* env = AttachCurrentThread(); | 142 JNIEnv* env = AttachCurrentThread(); |
139 return Java_WindowAndroid_canRequestPermission( | 143 return Java_WindowAndroid_canRequestPermission( |
140 env, | 144 env, |
141 GetJavaObject().obj(), | 145 GetJavaObject().obj(), |
142 base::android::ConvertUTF8ToJavaString(env, permission).obj()); | 146 base::android::ConvertUTF8ToJavaString(env, permission).obj()); |
143 } | 147 } |
144 | 148 |
| 149 const gfx::DeviceDisplayInfo& WindowAndroid::GetDeviceDisplayInfo() const { |
| 150 return *device_display_info_; |
| 151 } |
| 152 |
145 // ---------------------------------------------------------------------------- | 153 // ---------------------------------------------------------------------------- |
146 // Native JNI methods | 154 // Native JNI methods |
147 // ---------------------------------------------------------------------------- | 155 // ---------------------------------------------------------------------------- |
148 | 156 |
149 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 157 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
150 WindowAndroid* window = new WindowAndroid(env, obj); | 158 WindowAndroid* window = new WindowAndroid(env, obj); |
151 return reinterpret_cast<intptr_t>(window); | 159 return reinterpret_cast<intptr_t>(window); |
152 } | 160 } |
153 | 161 |
154 } // namespace ui | 162 } // namespace ui |
OLD | NEW |