Make WindowAndroid a ViewAndroid

content/browser/android/content_view_core_impl.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/android/content_view_core_impl.h"
 
 #include <stddef.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 200 matching lines @@
 
 ContentViewCoreImpl::ContentViewCoreImpl(
     JNIEnv* env,
     jobject obj,
     WebContents* web_contents,
     const base::android::JavaRef<jobject>& view_android_delegate,
     ui::WindowAndroid* window_android,
     jobject java_bridge_retained_object_set)
     : WebContentsObserver(web_contents),
       java_ref_(env, obj),
-      view_(view_android_delegate, window_android),
+      view_(view_android_delegate),
       web_contents_(static_cast<WebContentsImpl*>(web_contents)),
       page_scale_(1),
       dpi_scale_(ui::GetScaleFactorForNativeView(&view_)),
       device_orientation_(0),
       accessibility_enabled_(false) {
   CHECK(web_contents) <<
       "A ContentViewCoreImpl should be created with a valid WebContents.";
   DCHECK(window_android);
   DCHECK(!view_android_delegate.is_null());
+  window_android->AddChild(&view_);
   view_.SetLayer(cc::SolidColorLayer::Create());
   view_.GetLayer()->SetBackgroundColor(GetBackgroundColor(env, obj));
   gfx::Size physical_size(
       Java_ContentViewCore_getPhysicalBackingWidthPix(env, obj),
       Java_ContentViewCore_getPhysicalBackingHeightPix(env, obj));
   view_.GetLayer()->SetBounds(physical_size);
   view_.GetLayer()->SetIsDrawable(true);
 
   // Currently, the only use case we have for overriding a user agent involves
   // spoofing a desktop Linux user agent for "Request desktop site".
@@ skipping 37 matching lines @@
         env, j_obj.obj(), reinterpret_cast<intptr_t>(this));
   }
 }
 
 void ContentViewCoreImpl::UpdateWindowAndroid(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& obj,
     jlong window_android) {
   if (window_android) {
     DCHECK(!view_.GetWindowAndroid());
-    view_.SetWindowAndroid(
-        reinterpret_cast<ui::WindowAndroid*>(window_android));
+    ui::WindowAndroid* window =
+        reinterpret_cast<ui::WindowAndroid*>(window_android);
+    window->AddChild(&view_);
     FOR_EACH_OBSERVER(ContentViewCoreImplObserver,
                       observer_list_,
                       OnAttachedToWindow());
   } else {
     FOR_EACH_OBSERVER(ContentViewCoreImplObserver,
                       observer_list_,
                       OnDetachedFromWindow());
-    view_.SetWindowAndroid(nullptr);
+    view_.RemoveFromParent();
   }
 }
 
 base::android::ScopedJavaLocalRef<jobject>
 ContentViewCoreImpl::GetWebContentsAndroid(JNIEnv* env,
                                            const JavaParamRef<jobject>& obj) {
   return web_contents_->GetJavaWebContents();
 }
 
 base::android::ScopedJavaLocalRef<jobject>
@@ skipping 553 matching lines @@
     return;
 
   web_contents_->SelectRange(base_point, extent_point);
 }
 
 const base::android::JavaRef<jobject>&
 ContentViewCoreImpl::GetViewAndroidDelegate() const {
   return view_.GetViewAndroidDelegate();
 }
 
-ui::WindowAndroid* ContentViewCoreImpl::GetWindowAndroid() const {

[Yusuf, 2016/07/13 19:54:36]

why remove this?

[no sievers, 2016/07/13 23:32:12]

Done. WindowAndroid::GetWindowAndroid() const override needs to cast away the
constness though now.

+ui::WindowAndroid* ContentViewCoreImpl::GetWindowAndroid() {
   return view_.GetWindowAndroid();
 }
 
 cc::Layer* ContentViewCoreImpl::GetLayer() const {
   return view_.GetLayer();
 }
 
 ui::ViewAndroid* ContentViewCoreImpl::GetViewAndroid() {
   return &view_;
 }
@@ skipping 772 matching lines @@
     return ScopedJavaLocalRef<jobject>();
 
   return view->GetJavaObject();
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env) && JNI_DragEvent::RegisterNativesImpl(env);
 }
 
 }  // namespace content