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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 return Java_WindowAndroid_canRequestPermission( | 129 return Java_WindowAndroid_canRequestPermission( |
130 env, | 130 env, |
131 GetJavaObject().obj(), | 131 GetJavaObject().obj(), |
132 base::android::ConvertUTF8ToJavaString(env, permission).obj()); | 132 base::android::ConvertUTF8ToJavaString(env, permission).obj()); |
133 } | 133 } |
134 | 134 |
135 // ---------------------------------------------------------------------------- | 135 // ---------------------------------------------------------------------------- |
136 // Native JNI methods | 136 // Native JNI methods |
137 // ---------------------------------------------------------------------------- | 137 // ---------------------------------------------------------------------------- |
138 | 138 |
139 jlong Init(JNIEnv* env, jobject obj) { | 139 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
140 WindowAndroid* window = new WindowAndroid(env, obj); | 140 WindowAndroid* window = new WindowAndroid(env, obj); |
141 return reinterpret_cast<intptr_t>(window); | 141 return reinterpret_cast<intptr_t>(window); |
142 } | 142 } |
143 | 143 |
144 } // namespace ui | 144 } // namespace ui |
OLD | NEW |