Refactor the Android port to allow access to the chrome layer.

content/browser/android/content_view_core_impl.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/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 219 matching lines @@
 ScopedJavaLocalRef<jstring> ContentViewCoreImpl::GetURL(
     JNIEnv* env, jobject) const {
   return ConvertUTF8ToJavaString(env, web_contents()->GetURL().spec());
 }
 
 ScopedJavaLocalRef<jstring> ContentViewCoreImpl::GetTitle(
     JNIEnv* env, jobject obj) const {
   return ConvertUTF16ToJavaString(env, web_contents()->GetTitle());
 }
 
-jdouble ContentViewCoreImpl::GetLoadProgress(JNIEnv* env, jobject obj) const {
-  // An empty page never loads anything and always has a progress of 0.
-  // We report 1 in that case so the UI does not assume the page is loading.
-  if (web_contents()->GetURL().is_empty() || !content_view_client_.get())
-    return static_cast<jdouble>(1.0);
-  return static_cast<jdouble>(content_view_client_->GetLoadProgress());
-}
-
 jboolean ContentViewCoreImpl::IsIncognito(JNIEnv* env, jobject obj) {
   return web_contents()->GetBrowserContext()->IsOffTheRecord();
 }
 
 jboolean ContentViewCoreImpl::TouchEvent(JNIEnv* env,
                                          jobject obj,
                                          jlong time_ms,
                                          jint type,
                                          jobjectArray pts) {
   RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
@@ skipping 131 matching lines @@
 }
 
 jboolean ContentViewCoreImpl::NeedsReload(JNIEnv* env, jobject obj) {
   return web_contents_->GetController().NeedsReload();
 }
 
 void ContentViewCoreImpl::SetClient(JNIEnv* env, jobject obj, jobject jclient) {
   scoped_ptr<ContentViewClient> client(
       ContentViewClient::CreateNativeContentViewClient(env, jclient));
 
-  web_contents_->SetDelegate(client.get());
-
   content_view_client_.swap(client);
 }
 
 void ContentViewCoreImpl::AddJavascriptInterface(
     JNIEnv* env,
     jobject /* obj */,
     jobject object,
     jstring name,
     jboolean require_annotation) {
   ScopedJavaLocalRef<jobject> scoped_object(env, object);
@@ skipping 215 matching lines @@
   if (!HasField(env, clazz, "mNativeContentViewCore", "I")) {
     DLOG(ERROR) << "Unable to find ContentView.mNativeContentViewCore!";
     return false;
   }
   g_native_content_view = GetFieldID(env, clazz, "mNativeContentViewCore", "I");
 
   return RegisterNativesImpl(env) >= 0;
 }
 
 }  // namespace content