Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Side by Side Diff: ui/android/window_android.cc

Issue 2688113002: Make ViewRoot the top of the ViewAndroid tree (Closed)
Patch Set: - Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 122
123 ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() { 123 ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() {
124 return base::android::ScopedJavaLocalRef<jobject>(java_window_); 124 return base::android::ScopedJavaLocalRef<jobject>(java_window_);
125 } 125 }
126 126
127 bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) { 127 bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) {
128 return RegisterNativesImpl(env); 128 return RegisterNativesImpl(env);
129 } 129 }
130 130
131 WindowAndroid::~WindowAndroid() { 131 WindowAndroid::~WindowAndroid() {
132 DCHECK(parent_ == nullptr) << "WindowAndroid must be a root view.";
133 DCHECK(!compositor_); 132 DCHECK(!compositor_);
134 Java_WindowAndroid_clearNativePointer(AttachCurrentThread(), GetJavaObject()); 133 Java_WindowAndroid_clearNativePointer(AttachCurrentThread(), GetJavaObject());
135 } 134 }
136 135
137 WindowAndroid* WindowAndroid::CreateForTesting() { 136 WindowAndroid* WindowAndroid::CreateForTesting() {
138 JNIEnv* env = AttachCurrentThread(); 137 JNIEnv* env = AttachCurrentThread();
139 const JavaRef<jobject>& context = base::android::GetApplicationContext(); 138 const JavaRef<jobject>& context = base::android::GetApplicationContext();
140 long native_pointer = Java_WindowAndroid_createForTesting(env, context); 139 long native_pointer = Java_WindowAndroid_createForTesting(env, context);
141 return reinterpret_cast<WindowAndroid*>(native_pointer); 140 return reinterpret_cast<WindowAndroid*>(native_pointer);
142 } 141 }
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 base::android::ConvertUTF8ToJavaString(env, permission)); 250 base::android::ConvertUTF8ToJavaString(env, permission));
252 } 251 }
253 252
254 bool WindowAndroid::CanRequestPermission(const std::string& permission) { 253 bool WindowAndroid::CanRequestPermission(const std::string& permission) {
255 JNIEnv* env = AttachCurrentThread(); 254 JNIEnv* env = AttachCurrentThread();
256 return Java_WindowAndroid_canRequestPermission( 255 return Java_WindowAndroid_canRequestPermission(
257 env, GetJavaObject(), 256 env, GetJavaObject(),
258 base::android::ConvertUTF8ToJavaString(env, permission)); 257 base::android::ConvertUTF8ToJavaString(env, permission));
259 } 258 }
260 259
261 WindowAndroid* WindowAndroid::GetWindowAndroid() const {
262 DCHECK(parent_ == nullptr);
263 return const_cast<WindowAndroid*>(this);
264 }
265
266 // ---------------------------------------------------------------------------- 260 // ----------------------------------------------------------------------------
267 // Native JNI methods 261 // Native JNI methods
268 // ---------------------------------------------------------------------------- 262 // ----------------------------------------------------------------------------
269 263
270 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj, int sdk_display_id) { 264 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj, int sdk_display_id) {
271 WindowAndroid* window = new WindowAndroid(env, obj, sdk_display_id); 265 WindowAndroid* window = new WindowAndroid(env, obj, sdk_display_id);
272 return reinterpret_cast<intptr_t>(window); 266 return reinterpret_cast<intptr_t>(window);
273 } 267 }
274 268
275 } // namespace ui 269 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698