Revert "Revert 158067 - Remove native side of content_view_client"

content/browser/android/web_contents_observer_android.cc

 // 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.
 
 #include "content/browser/android/web_contents_observer_android.h"
 
 #include <string>
 
 #include <jni.h>
 
@@ skipping 17 matching lines @@
     JNIEnv* env,
     jobject obj,
     WebContents* web_contents)
     : WebContentsObserver(web_contents),
       weak_java_observer_(env, obj){
 }
 
 WebContentsObserverAndroid::~WebContentsObserverAndroid() {
 }
 
-jint Init(JNIEnv* env, jobject obj, jint native_web_contents) {
-  WebContents* web_contents =
-      reinterpret_cast<WebContents*>(native_web_contents);
+jint Init(JNIEnv* env, jobject obj, jint native_content_view_core) {
+  ContentViewCore* content_view_core =
+      reinterpret_cast<ContentViewCore*>(native_content_view_core);
   WebContentsObserverAndroid* native_observer = new WebContentsObserverAndroid(
-      env, obj, web_contents);
+      env, obj, content_view_core->GetWebContents());
   return reinterpret_cast<jint>(native_observer);
 }
 
 void WebContentsObserverAndroid::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
 void WebContentsObserverAndroid::WebContentsDestroyed(
     WebContents* web_contents) {
   JNIEnv* env = AttachCurrentThread();
@@ skipping 45 matching lines @@
     int64 frame_id,
     const GURL& validated_url,
     bool is_main_frame,
     int error_code,
     const string16& error_description,
     RenderViewHost* render_view_host) {
   DidFailLoadInternal(
         false, is_main_frame, error_code, error_description, validated_url);
 }
 
+void WebContentsObserverAndroid::DidNavigateMainFrame(
+    const LoadCommittedDetails& details,
+    const FrameNavigateParams& params) {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> obj = weak_java_observer_.get(env);
+  if (obj.is_null())
+    return;
+  ScopedJavaLocalRef<jstring> jstring_url =
+      ConvertUTF8ToJavaString(env, params.url.spec());
+  ScopedJavaLocalRef<jstring> jstring_base_url =
+      ConvertUTF8ToJavaString(env, params.base_url.spec());
+  Java_WebContentsObserverAndroid_didNavigateMainFrame(
+      env, obj.obj(), jstring_url.obj(), jstring_base_url.obj());
+}
+
 void WebContentsObserverAndroid::DidFailLoadInternal(
     bool is_provisional_load,
     bool is_main_frame,
     int error_code,
     const string16& description,
     const GURL& url) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = weak_java_observer_.get(env);
   if (obj.is_null())
     return;
@@ skipping 11 matching lines @@
 }
 
 bool RegisterWebContentsObserverAndroid(JNIEnv* env) {
   if (!HasClass(env, kWebContentsObserverAndroidClassPath)) {
     DLOG(ERROR) << "Unable to find class WebContentsObserverAndroid!";
     return false;
   }
   return RegisterNativesImpl(env);
 }
 }  // namespace content