Refactor ContentViewClient (1/6)

chromecast/browser/android/cast_window_android.cc

 // Copyright 2014 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 "chromecast/browser/android/cast_window_android.h"
 
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "chromecast/base/version.h"
 #include "chromecast/browser/android/cast_window_manager.h"
 #include "chromecast/browser/cast_content_window.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/common/renderer_preferences.h"
@@ skipping 38 matching lines @@
 
 void CastWindowAndroid::Initialize() {
   web_contents_ = content_window_->CreateWebContents(browser_context_);
   web_contents_->SetDelegate(this);
   content::WebContentsObserver::Observe(web_contents_.get());
 
   JNIEnv* env = base::android::AttachCurrentThread();
   window_java_.Reset(CreateCastWindowView(this));
 
   Java_CastWindowAndroid_initFromNativeWebContents(
-      env, window_java_.obj(), web_contents_->GetJavaWebContents().obj(),
-      web_contents_->GetRenderProcessHost()->GetID());
+      env, window_java_, web_contents_->GetJavaWebContents(),
+      web_contents_->GetRenderProcessHost()->GetID(),
+      base::android::ConvertUTF8ToJavaString(env, PRODUCT_VERSION));
 
   // Enabling hole-punching also requires runtime renderer preference
   content::RendererPreferences* prefs =
       web_contents_->GetMutableRendererPrefs();
   prefs->use_video_overlay_for_embedded_encrypted_video = true;
   web_contents_->GetRenderViewHost()->SyncRendererPrefs();
 }
 
 CastWindowAndroid::~CastWindowAndroid() {
 }
@@ skipping 57 matching lines @@
                                             int32_t line_no,
                                             const base::string16& source_id) {
   return false;
 }
 
 void CastWindowAndroid::ActivateContents(content::WebContents* contents) {
   DCHECK_EQ(contents, web_contents_.get());
   contents->GetRenderViewHost()->GetWidget()->Focus();
 }
 
+base::android::ScopedJavaLocalRef<jobject>
+CastWindowAndroid::GetContentVideoViewEmbedder() {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  return Java_CastWindowAndroid_getContentVideoViewEmbedder(env, window_java_);
+}
+
 void CastWindowAndroid::RenderProcessGone(base::TerminationStatus status) {
   LOG(ERROR) << "Render process gone: status=" << status;
   Destroy();
 }
 
 }  // namespace shell
 }  // namespace chromecast