Android: Extend ViewAndroid

chrome/browser/android/bottombar/overlay_panel_content.cc

 // Copyright 2015 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.
 
 #include "chrome/browser/android/bottombar/overlay_panel_content.h"
 
 #include <set>
 
 #include "base/android/jni_string.h"
 #include "base/callback.h"
@@ skipping 89 matching lines @@
   // TODO(pedrosimonetti): Confirm with dtrainor@ if the comment above
   // is accurate.
   web_contents_.reset(web_contents);
   // TODO(pedrosimonetti): confirm if we need this after promoting it
   // to a real tab.
   TabAndroid::AttachTabHelpers(web_contents_.get());
   web_contents_delegate_.reset(
       new web_contents_delegate_android::WebContentsDelegateAndroid(
           env, jweb_contents_delegate));
   web_contents_->SetDelegate(web_contents_delegate_.get());
-}
-
-void OverlayPanelContent::SetViewAndroid(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& obj,
-    const JavaParamRef<jobject>& jcontent_view_core) {
-  content::ContentViewCore* content_view_core =
-      content::ContentViewCore::GetNativeContentViewCore(env,
-                                                         jcontent_view_core);
-  DCHECK(content_view_core);
-
   ViewAndroidHelper::FromWebContents(web_contents_.get())
-      ->SetViewAndroid(content_view_core);
+      ->SetViewAndroid(web_contents_->GetNativeView());
 }
 
 void OverlayPanelContent::DestroyWebContents(
     JNIEnv* env,
     const JavaParamRef<jobject>& jobj) {
   DCHECK(web_contents_.get());
   web_contents_.reset();
   // |web_contents_delegate_| may already be NULL at this point.
   web_contents_delegate_.reset();
 }
@@ skipping 13 matching lines @@
 }
 
 bool RegisterOverlayPanelContent(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   OverlayPanelContent* content = new OverlayPanelContent(env, obj);
   return reinterpret_cast<intptr_t>(content);
 }