Have WebContentsViewAndroid own ViewAndroid

content/browser/android/content_view_core_impl.h

Index: content/browser/android/content_view_core_impl.h
diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
index 29dcb83f7db3ffbe2f70a2b0a3171968dd5d1300..1227da65901fdc21ff427c772d423b311929785d 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -54,8 +54,6 @@ class ContentViewCoreImpl : public ContentViewCore,
       JNIEnv* env,
       const base::android::JavaRef<jobject>& obj,
       WebContents* web_contents,
-      const base::android::JavaRef<jobject>& view_android_delegate,
-      ui::WindowAndroid* window_android,
       const base::android::JavaRef<jobject>& java_bridge_retained_object_set);
 
   // ContentViewCore implementation.
@@ -389,7 +387,7 @@ class ContentViewCoreImpl : public ContentViewCore,
 
   void OnShowUnhandledTapUIIfNeeded(int x_dip, int y_dip);
 
-  ui::ViewAndroid* GetViewAndroid();
+  ui::ViewAndroid* GetViewAndroid() const;

[boliu, 2016/10/31 01:45:52]

maybe not in this CL, but eventually should remove this too, no sure how hard
that is

[Jinsuk Kim, 2016/10/31 02:01:16]

Acknowledged. Do you mean just 'const' or GetViewAndroid() method?

[boliu, 2016/10/31 02:05:45]

whole method, things should ask WebContentsView for the Viewandroid, not go
through CVC

 
  private:
   class ContentViewUserData;
@@ -442,8 +440,6 @@ class ContentViewCoreImpl : public ContentViewCore,
   // Select popup view
   ui::ViewAndroid::ScopedAnchorView select_popup_;
 
-  ui::ViewAndroid view_;
-
   // Reference to the current WebContents used to determine how and what to
   // display in the ContentViewCore.
   WebContentsImpl* web_contents_;