Android: Extend ViewAndroid

content/browser/web_contents/web_contents_view_android.cc

Index: content/browser/web_contents/web_contents_view_android.cc
diff --git a/content/browser/web_contents/web_contents_view_android.cc b/content/browser/web_contents/web_contents_view_android.cc
index 77d2c5fe24e08fd72cee7a6f44dbc2c078a62661..cc361a58a852b67bf12a34bbb211e39efce0bef6 100644
--- a/content/browser/web_contents/web_contents_view_android.cc
+++ b/content/browser/web_contents/web_contents_view_android.cc
@@ -59,15 +59,20 @@ void WebContentsViewAndroid::SetContentViewCore(
 }
 
 gfx::NativeView WebContentsViewAndroid::GetNativeView() const {
-  return content_view_core_ ? content_view_core_ : NULL;
+  return content_view_core_ ? content_view_core_->GetViewAndroid() : nullptr;
 }
 
 gfx::NativeView WebContentsViewAndroid::GetContentNativeView() const {
-  return content_view_core_ ? content_view_core_ : NULL;
+  RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView();
+  if (rwhv)
+    return rwhv->GetNativeView();
+
+  // TODO(sievers): This should return null.

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

is this a placeholder for now?

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

This is from web_contents_view.h:

 // Returns the native widget that contains the contents of the tab.
  virtual gfx::NativeView GetNativeView() const = 0;

  // Returns the native widget with the main content of the tab (i.e. the main
  // render view host, though there may be many popups in the tab as children of
  // the container).
  virtual gfx::NativeView GetContentNativeView() const = 0;

So I think it's probably more correct to return the RWHV's view only here as
long as it exists and null otherwise instead of falling back to reach up to the
container view.

But I haven't look what the implications of that are in detail, and thought it'd
be nice to therefore avoid the behavioral change in this patch (this way we'd
still get to the WindowAndroid if somebody used this API for that even if RWHV
is null).

+  return GetNativeView();
 }
 
 gfx::NativeWindow WebContentsViewAndroid::GetTopLevelNativeWindow() const {
-  return content_view_core_ ? content_view_core_->GetWindowAndroid() : NULL;
+  return content_view_core_ ? content_view_core_->GetWindowAndroid() : nullptr;
 }
 
 void WebContentsViewAndroid::GetContainerBounds(gfx::Rect* out) const {