Android: Extend ViewAndroid

content/public/browser/android/content_view_core.h

Index: content/public/browser/android/content_view_core.h
diff --git a/content/public/browser/android/content_view_core.h b/content/public/browser/android/content_view_core.h
index 38157043207275787b11d98ba2f3b5eee65d86d3..44a2e3f81128f5b7944a4edb42d9964cb4c06ffb 100644
--- a/content/public/browser/android/content_view_core.h
+++ b/content/public/browser/android/content_view_core.h
@@ -34,7 +34,7 @@ class WebContents;
 // Native side of the ContentViewCore.java, which is the primary way of
 // communicating with the native Chromium code on Android.  This is a
 // public interface used by native code outside of the content module.
-class CONTENT_EXPORT ContentViewCore : public ui::ViewAndroid {
+class CONTENT_EXPORT ContentViewCore {
  public:
   // Returns the existing ContentViewCore for |web_contents|, or nullptr.
   static ContentViewCore* FromWebContents(WebContents* web_contents);
@@ -44,7 +44,6 @@ class CONTENT_EXPORT ContentViewCore : public ui::ViewAndroid {
 
   // May return null reference.
   virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() = 0;
-  virtual const scoped_refptr<cc::Layer>& GetLayer() const = 0;
   virtual bool ShowPastePopup(int x, int y) = 0;
 
   virtual float GetDpiScale() const = 0;
@@ -57,8 +56,13 @@ class CONTENT_EXPORT ContentViewCore : public ui::ViewAndroid {
                                 int start_offset,
                                 int end_offset)>& callback) = 0;
 
+  virtual ui::WindowAndroid* GetWindowAndroid() const = 0;
+  virtual const base::android::JavaRef<jobject>& GetViewAndroidDelegate()
+      const = 0;
+  virtual cc::Layer* GetLayer() const = 0;
+
  protected:
- ~ContentViewCore() override {}
+ ~ContentViewCore() {}
 };
 
 };  // namespace content