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 8c326e0c0ca3be8771203bc8b9de5664003857de..f0220cfcd41221a341fd966d2f607bfbbf0a43fe 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.
+  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 {