Separate SwipeRefreshHandler and ContentViewCore

content/browser/web_contents/web_contents_view_android.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_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
 #include "content/browser/web_contents/web_contents_view.h"
 #include "content/public/browser/web_contents_view_delegate.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/public/common/drop_data.h"
+#include "ui/android/overscroll_refresh.h"
 #include "ui/android/view_android.h"
 #include "ui/gfx/geometry/rect_f.h"
 
 namespace content {
 class ContentViewCoreImpl;
 class RenderWidgetHostViewAndroid;
 class SynchronousCompositorClient;
 class WebContentsImpl;
 
 // Android-specific implementation of the WebContentsView.
@@ skipping 10 matching lines @@
   void SetContentViewCore(ContentViewCoreImpl* content_view_core);
 
   void set_synchronous_compositor_client(SynchronousCompositorClient* client) {
     synchronous_compositor_client_ = client;
   }
 
   SynchronousCompositorClient* synchronous_compositor_client() const {
     return synchronous_compositor_client_;
   }
 
+  void SetOverscrollRefreshHandler(

[boliu, 2016/12/01 00:01:57]

this should not be inlined

also what if RWHVA is already created when this is called?

[rlanday, 2016/12/01 00:44:51]

Yeah this is kind of sloppy...what's a good way to do this? I can think of a
couple options, none of which seem great:
1. Enforce via invariant that this method can't be called after the RWHVA is
constructed
2. Add a bunch of code that may never get used to support switching out the
RenderWidgetHostViewAndroid's OverscrollRefreshHandler?
3. Allow calling the method but just not do anything with the
OverscrollRefreshHandler? (the way it currently works)

I don't think passing it in the WebContentsViewAndroid constructor really works
unless we have it all the way back in WebContents::CreateParams when we create
the WebContents object, which I suspect will not work

[boliu, 2016/12/01 00:50:38]

RWHVA can be created before WCVA, ie popups
This looks like the only option.

+      const base::android::JavaParamRef<jobject>& overscroll_refresh_handler) {
+    overscroll_refresh_handler_.Reset(nullptr, overscroll_refresh_handler);
+  }
+
   // WebContentsView implementation --------------------------------------------
   gfx::NativeView GetNativeView() const override;
   gfx::NativeView GetContentNativeView() const override;
   gfx::NativeWindow GetTopLevelNativeWindow() const override;
   void GetScreenInfo(ScreenInfo* screen_info) const override;
   void GetContainerBounds(gfx::Rect* out) const override;
   void SizeContents(const gfx::Size& size) override;
   void Focus() override;
   void SetInitialFocus() override;
   void StoreFocus() override;
@@ skipping 45 matching lines @@
                      const gfx::Point& screen_location);
   void OnDragEnded();
 
  private:
   // The WebContents whose contents we display.
   WebContentsImpl* web_contents_;
 
   // ContentViewCoreImpl is our interface to the view system.
   ContentViewCoreImpl* content_view_core_;
 
+  // Handles "overscroll to refresh" events
+  base::android::ScopedJavaGlobalRef<jobject> overscroll_refresh_handler_;
+
   // Interface for extensions to WebContentsView. Used to show the context menu.
   std::unique_ptr<WebContentsViewDelegate> delegate_;
 
   // The native view associated with the contents of the web.
   ui::ViewAndroid view_;
 
   // Interface used to get notified of events from the synchronous compositor.
   SynchronousCompositorClient* synchronous_compositor_client_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid);
 };
 
 } // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_