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

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

Issue 2626723003: Revert "Introduce ViewRoot forwarding input/view events to native" (Closed)
Patch Set: Created 3 years, 11 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
« no previous file with comments | « ui/android/window_android.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 for (WindowAndroidObserver& observer : observer_list_) 237 for (WindowAndroidObserver& observer : observer_list_)
238 observer.OnActivityStopped(); 238 observer.OnActivityStopped();
239 } 239 }
240 240
241 void WindowAndroid::OnActivityStarted(JNIEnv* env, 241 void WindowAndroid::OnActivityStarted(JNIEnv* env,
242 const JavaParamRef<jobject>& obj) { 242 const JavaParamRef<jobject>& obj) {
243 for (WindowAndroidObserver& observer : observer_list_) 243 for (WindowAndroidObserver& observer : observer_list_)
244 observer.OnActivityStarted(); 244 observer.OnActivityStarted();
245 } 245 }
246 246
247 ScopedJavaLocalRef<jobject> WindowAndroid::GetViewRootForJava(
248 JNIEnv* env,
249 const base::android::JavaParamRef<jobject>& obj) {
250 return GetViewRoot();
251 }
252
253 bool WindowAndroid::HasPermission(const std::string& permission) { 247 bool WindowAndroid::HasPermission(const std::string& permission) {
254 JNIEnv* env = AttachCurrentThread(); 248 JNIEnv* env = AttachCurrentThread();
255 return Java_WindowAndroid_hasPermission( 249 return Java_WindowAndroid_hasPermission(
256 env, GetJavaObject(), 250 env, GetJavaObject(),
257 base::android::ConvertUTF8ToJavaString(env, permission)); 251 base::android::ConvertUTF8ToJavaString(env, permission));
258 } 252 }
259 253
260 bool WindowAndroid::CanRequestPermission(const std::string& permission) { 254 bool WindowAndroid::CanRequestPermission(const std::string& permission) {
261 JNIEnv* env = AttachCurrentThread(); 255 JNIEnv* env = AttachCurrentThread();
262 return Java_WindowAndroid_canRequestPermission( 256 return Java_WindowAndroid_canRequestPermission(
263 env, GetJavaObject(), 257 env, GetJavaObject(),
264 base::android::ConvertUTF8ToJavaString(env, permission)); 258 base::android::ConvertUTF8ToJavaString(env, permission));
265 } 259 }
266 260
267 WindowAndroid* WindowAndroid::GetWindowAndroid() const { 261 WindowAndroid* WindowAndroid::GetWindowAndroid() const {
268 DCHECK(parent_ == nullptr); 262 DCHECK(parent_ == nullptr);
269 return const_cast<WindowAndroid*>(this); 263 return const_cast<WindowAndroid*>(this);
270 } 264 }
271 265
272 // ---------------------------------------------------------------------------- 266 // ----------------------------------------------------------------------------
273 // Native JNI methods 267 // Native JNI methods
274 // ---------------------------------------------------------------------------- 268 // ----------------------------------------------------------------------------
275 269
276 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj, int sdk_display_id) { 270 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj, int sdk_display_id) {
277 WindowAndroid* window = new WindowAndroid(env, obj, sdk_display_id); 271 WindowAndroid* window = new WindowAndroid(env, obj, sdk_display_id);
278 return reinterpret_cast<intptr_t>(window); 272 return reinterpret_cast<intptr_t>(window);
279 } 273 }
280 274
281 } // namespace ui 275 } // namespace ui
OLDNEW
« no previous file with comments | « ui/android/window_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698