| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 "content/browser/android/content_view_core_impl.h" | 5 #include "content/browser/android/content_view_core_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 10 #include "base/android/jni_array.h" | 10 #include "base/android/jni_array.h" |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 const base::android::JavaParamRef<jobject>& obj, | 278 const base::android::JavaParamRef<jobject>& obj, |
| 279 jlong window_android) { | 279 jlong window_android) { |
| 280 if (window_android) { | 280 if (window_android) { |
| 281 DCHECK(!view_.GetWindowAndroid()); | 281 DCHECK(!view_.GetWindowAndroid()); |
| 282 ui::WindowAndroid* window = | 282 ui::WindowAndroid* window = |
| 283 reinterpret_cast<ui::WindowAndroid*>(window_android); | 283 reinterpret_cast<ui::WindowAndroid*>(window_android); |
| 284 window->AddChild(&view_); | 284 window->AddChild(&view_); |
| 285 FOR_EACH_OBSERVER(ContentViewCoreImplObserver, | 285 FOR_EACH_OBSERVER(ContentViewCoreImplObserver, |
| 286 observer_list_, | 286 observer_list_, |
| 287 OnAttachedToWindow()); | 287 OnAttachedToWindow()); |
| 288 Java_ContentViewCore_onAttachedToWindowAndroid(env, obj.obj()); |
| 288 } else { | 289 } else { |
| 289 FOR_EACH_OBSERVER(ContentViewCoreImplObserver, | 290 FOR_EACH_OBSERVER(ContentViewCoreImplObserver, |
| 290 observer_list_, | 291 observer_list_, |
| 291 OnDetachedFromWindow()); | 292 OnDetachedFromWindow()); |
| 293 Java_ContentViewCore_onDetachedFromWindowAndroid(env, obj.obj()); |
| 292 view_.RemoveFromParent(); | 294 view_.RemoveFromParent(); |
| 293 } | 295 } |
| 294 } | 296 } |
| 295 | 297 |
| 296 base::android::ScopedJavaLocalRef<jobject> | 298 base::android::ScopedJavaLocalRef<jobject> |
| 297 ContentViewCoreImpl::GetWebContentsAndroid(JNIEnv* env, | 299 ContentViewCoreImpl::GetWebContentsAndroid(JNIEnv* env, |
| 298 const JavaParamRef<jobject>& obj) { | 300 const JavaParamRef<jobject>& obj) { |
| 299 return web_contents_->GetJavaWebContents(); | 301 return web_contents_->GetJavaWebContents(); |
| 300 } | 302 } |
| 301 | 303 |
| (...skipping 1335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1637 return ScopedJavaLocalRef<jobject>(); | 1639 return ScopedJavaLocalRef<jobject>(); |
| 1638 | 1640 |
| 1639 return view->GetJavaObject(); | 1641 return view->GetJavaObject(); |
| 1640 } | 1642 } |
| 1641 | 1643 |
| 1642 bool RegisterContentViewCore(JNIEnv* env) { | 1644 bool RegisterContentViewCore(JNIEnv* env) { |
| 1643 return RegisterNativesImpl(env); | 1645 return RegisterNativesImpl(env); |
| 1644 } | 1646 } |
| 1645 | 1647 |
| 1646 } // namespace content | 1648 } // namespace content |
| OLD | NEW |