Factor out ContentViewAndroidDelegate

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 35 matching lines @@
 
 class ContentViewCoreImpl : public ContentViewCore,
                             public ui::OverscrollRefreshHandler,
                             public WebContentsObserver {
  public:
   static ContentViewCoreImpl* FromWebContents(WebContents* web_contents);
   ContentViewCoreImpl(
       JNIEnv* env,
       jobject obj,
       WebContents* web_contents,
+      const base::android::JavaRef<jobject>& view_context,
       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 base::android::JavaRef<jobject>& GetViewAndroidDelegate()
-      const override;
+  ui::ViewAndroid* GetViewAndroid() 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;
 
@@ skipping 321 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_;
 
+  // Select popup view
+  base::android::ScopedJavaGlobalRef<jobject> select_popup_;
+
   ui::ViewAndroid view_;
 
   // Reference to the current WebContents used to determine how and what to
   // display in the ContentViewCore.
   WebContentsImpl* web_contents_;
 
   // Page scale factor.
   float page_scale_;
 
   // Device scale factor.
@@ skipping 12 matching lines @@
   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_