| 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 | 16 |
| 17 namespace ui { | 17 namespace ui { |
| 18 | 18 |
| 19 using base::android::AttachCurrentThread; | 19 using base::android::AttachCurrentThread; |
| 20 using base::android::JavaRef; |
| 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) : compositor_(NULL) { |
| 23 java_window_.Reset(env, obj); | 24 java_window_.Reset(env, obj); |
| 24 } | 25 } |
| 25 | 26 |
| 26 void WindowAndroid::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 27 void WindowAndroid::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
| 27 delete this; | 28 delete this; |
| 28 } | 29 } |
| 29 | 30 |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 } | 136 } |
| 136 | 137 |
| 137 bool WindowAndroid::CanRequestPermission(const std::string& permission) { | 138 bool WindowAndroid::CanRequestPermission(const std::string& permission) { |
| 138 JNIEnv* env = AttachCurrentThread(); | 139 JNIEnv* env = AttachCurrentThread(); |
| 139 return Java_WindowAndroid_canRequestPermission( | 140 return Java_WindowAndroid_canRequestPermission( |
| 140 env, | 141 env, |
| 141 GetJavaObject().obj(), | 142 GetJavaObject().obj(), |
| 142 base::android::ConvertUTF8ToJavaString(env, permission).obj()); | 143 base::android::ConvertUTF8ToJavaString(env, permission).obj()); |
| 143 } | 144 } |
| 144 | 145 |
| 146 void WindowAndroid::StartDragAndDrop( |
| 147 const JavaRef<jobject>& jview_android_delegate, |
| 148 const JavaRef<jstring>& jtext, |
| 149 const JavaRef<jobject>& jimage) { |
| 150 JNIEnv* env = AttachCurrentThread(); |
| 151 Java_WindowAndroid_startDragAndDrop(env, GetJavaObject().obj(), |
| 152 jview_android_delegate.obj(), jtext.obj(), |
| 153 jimage.obj()); |
| 154 } |
| 155 |
| 145 // ---------------------------------------------------------------------------- | 156 // ---------------------------------------------------------------------------- |
| 146 // Native JNI methods | 157 // Native JNI methods |
| 147 // ---------------------------------------------------------------------------- | 158 // ---------------------------------------------------------------------------- |
| 148 | 159 |
| 149 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 160 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
| 150 WindowAndroid* window = new WindowAndroid(env, obj); | 161 WindowAndroid* window = new WindowAndroid(env, obj); |
| 151 return reinterpret_cast<intptr_t>(window); | 162 return reinterpret_cast<intptr_t>(window); |
| 152 } | 163 } |
| 153 | 164 |
| 154 } // namespace ui | 165 } // namespace ui |
| OLD | NEW |