Android: Extend ViewAndroid

content/browser/android/content_view_core_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 31 matching lines @@
 class GinJavaBridgeDispatcherHost;
 class RenderFrameHost;
 class RenderWidgetHostViewAndroid;
 struct MenuItem;
 
 class ContentViewCoreImpl : public ContentViewCore,
                             public ui::OverscrollRefreshHandler,
                             public WebContentsObserver {
  public:
   static ContentViewCoreImpl* FromWebContents(WebContents* web_contents);
-  ContentViewCoreImpl(JNIEnv* env,
-                      jobject obj,
-                      WebContents* web_contents,
-                      jobject view_android,
-                      ui::WindowAndroid* window_android,
-                      jobject java_bridge_retained_object_set);
+  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);
 
   // ContentViewCore implementation.
   base::android::ScopedJavaLocalRef<jobject> GetJavaObject() override;
   WebContents* GetWebContents() const override;
   ui::WindowAndroid* GetWindowAndroid() const override;
-  const scoped_refptr<cc::Layer>& GetLayer() const override;
+  const base::android::JavaRef<jobject>& GetViewAndroidDelegate()
+      const override;
+  cc::Layer* GetLayer() const override;
   bool ShowPastePopup(int x, int y) override;
   float GetDpiScale() const override;
   void PauseOrResumeGeolocation(bool should_pause) override;
   void RequestTextSurroundingSelection(
       int max_length,
       const base::Callback<void(const base::string16& content,
                                 int start_offset,
                                 int end_offset)>& callback) override;
 
   void AddObserver(ContentViewCoreImplObserver* observer);
   void RemoveObserver(ContentViewCoreImplObserver* observer);
 
-  // ViewAndroid implementation
-  base::android::ScopedJavaLocalRef<jobject> GetViewAndroidDelegate()
-      const override;
-
   // --------------------------------------------------------------------------
   // Methods called from Java via JNI
   // --------------------------------------------------------------------------
 
   base::android::ScopedJavaLocalRef<jobject> GetWebContentsAndroid(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj);
   base::android::ScopedJavaLocalRef<jobject> GetJavaWindowAndroid(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj);
@@ skipping 304 matching lines @@
   void AttachLayer(scoped_refptr<cc::Layer> layer);
   void RemoveLayer(scoped_refptr<cc::Layer> layer);
 
   void MoveRangeSelectionExtent(const gfx::PointF& extent);
 
   void SelectBetweenCoordinates(const gfx::PointF& base,
                                 const gfx::PointF& extent);
 
   void OnShowUnhandledTapUIIfNeeded(int x_dip, int y_dip);
 
+  ui::ViewAndroid* GetViewAndroid();
+
  private:
   class ContentViewUserData;
 
   friend class ContentViewUserData;
   ~ContentViewCoreImpl() override;
 
   // WebContentsObserver implementation.
   void RenderViewReady() override;
   void RenderViewHostChanged(RenderViewHost* old_host,
                              RenderViewHost* new_host) override;
@@ skipping 27 matching lines @@
   void SetFocusInternal(bool focused);
 
   // Send device_orientation_ to renderer.
   void SendOrientationChangeEventInternal();
 
   float dpi_scale() const { return dpi_scale_; }
 
   // A weak reference to the Java ContentViewCore object.
   JavaObjectWeakGlobalRef java_ref_;
 
+  ui::ViewAndroid view_;
+
   // Reference to the current WebContents used to determine how and what to
   // display in the ContentViewCore.
   WebContentsImpl* web_contents_;
 
-  // A compositor layer containing any layer that should be shown.
-  scoped_refptr<cc::Layer> root_layer_;
-
   // Page scale factor.
   float page_scale_;
 
-  // Java delegate to acquire and release anchor views from the NativeView
-  base::android::ScopedJavaGlobalRef<jobject> view_android_delegate_;
-
   // Device scale factor.
   const float dpi_scale_;
 
-  // The owning window that has a hold of main application activity.
-  ui::WindowAndroid* window_android_;
-
   // Observer to notify of lifecyle changes.
   base::ObserverList<ContentViewCoreImplObserver> observer_list_;
 
   // The cache of device's current orientation set from Java side, this value
   // will be sent to Renderer once it is ready.
   int device_orientation_;
 
   bool accessibility_enabled_;
 
   // Manages injecting Java objects.
   scoped_refptr<GinJavaBridgeDispatcherHost> java_bridge_dispatcher_host_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
 };
 
 bool RegisterContentViewCore(JNIEnv* env);
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_