| 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/base/android/view_android.h" | 5 #include "ui/android/view_android.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_weak_ref.h" | 8 #include "base/android/jni_weak_ref.h" |
| 9 #include "base/android/scoped_java_ref.h" | 9 #include "base/android/scoped_java_ref.h" |
| 10 #include "jni/ViewAndroid_jni.h" | 10 #include "jni/ViewAndroid_jni.h" |
| 11 #include "ui/base/android/window_android.h" | 11 #include "ui/android/window_android.h" |
| 12 | 12 |
| 13 namespace ui { | 13 namespace ui { |
| 14 | 14 |
| 15 using base::android::AttachCurrentThread; | 15 using base::android::AttachCurrentThread; |
| 16 using base::android::ScopedJavaLocalRef; | 16 using base::android::ScopedJavaLocalRef; |
| 17 | 17 |
| 18 ViewAndroid::ViewAndroid(JNIEnv* env, jobject obj, WindowAndroid* window) | 18 ViewAndroid::ViewAndroid(JNIEnv* env, jobject obj, WindowAndroid* window) |
| 19 : weak_java_view_(env, obj), | 19 : weak_java_view_(env, obj), |
| 20 window_android_(window) {} | 20 window_android_(window) {} |
| 21 | 21 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 42 ViewAndroid::~ViewAndroid() { | 42 ViewAndroid::~ViewAndroid() { |
| 43 } | 43 } |
| 44 | 44 |
| 45 jlong Init(JNIEnv* env, jobject obj, jlong window) { | 45 jlong Init(JNIEnv* env, jobject obj, jlong window) { |
| 46 ViewAndroid* view = new ViewAndroid( | 46 ViewAndroid* view = new ViewAndroid( |
| 47 env, obj, reinterpret_cast<ui::WindowAndroid*>(window)); | 47 env, obj, reinterpret_cast<ui::WindowAndroid*>(window)); |
| 48 return reinterpret_cast<intptr_t>(view); | 48 return reinterpret_cast<intptr_t>(view); |
| 49 } | 49 } |
| 50 | 50 |
| 51 } // namespace ui | 51 } // namespace ui |
| OLD | NEW |