Android: Extend ViewAndroid

content/public/browser/android/content_view_core.h

 // Copyright (c) 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_PUBLIC_BROWSER_ANDROID_CONTENT_VIEW_CORE_H_
 #define CONTENT_PUBLIC_BROWSER_ANDROID_CONTENT_VIEW_CORE_H_
 
 #include <jni.h>
 
 #include "base/android/scoped_java_ref.h"
@@ skipping 16 matching lines @@
 class WindowAndroid;
 }
 
 namespace content {
 
 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);
   static ContentViewCore* GetNativeContentViewCore(JNIEnv* env, jobject obj);
 
   virtual WebContents* GetWebContents() const = 0;
 
   // 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;
   virtual void PauseOrResumeGeolocation(bool should_pause) = 0;
 
   // Text surrounding selection.
   virtual void RequestTextSurroundingSelection(
       int max_length,
       const base::Callback<void(const base::string16& content,
                                 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;

[Yusuf, 2016/07/08 16:35:05]

should getViewAndroid be here too?

[no sievers, 2016/07/08 18:29:04]

I really want to get rid of CVC :)

I'm thinking since this interface is pretty small, it might even be feasible to
eliminate this one first. All the users of this would have to be converted to
use something else to get to the functionality, such as ViewAndroid,
WebContents(View) or something else.

+
  protected:
- ~ContentViewCore() override {}
+ ~ContentViewCore() {}
 };
 
 };  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_ANDROID_CONTENT_VIEW_CORE_H_