Revert 269075 "Revert 268939 "Pass RenderFrameHost to WebContent..."

trunk/src/content/browser/android/content_view_core_impl.h

Index: trunk/src/content/browser/android/content_view_core_impl.h
===================================================================
--- trunk/src/content/browser/android/content_view_core_impl.h	(revision 269108)
+++ trunk/src/content/browser/android/content_view_core_impl.h	(working copy)
@@ -31,6 +31,7 @@
 }
 
 namespace content {
+class JavaBridgeDispatcherHostManager;
 class RenderWidgetHostViewAndroid;
 struct MenuItem;
 
@@ -44,7 +45,8 @@
                       jobject obj,
                       WebContents* web_contents,
                       ui::ViewAndroid* view_android,
-                      ui::WindowAndroid* window_android);
+                      ui::WindowAndroid* window_android,
+                      jobject java_bridge_retained_object_set);
 
   // ContentViewCore implementation.
   virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() OVERRIDE;
@@ -184,8 +186,7 @@
                               jobject obj,
                               jobject object,
                               jstring name,
-                              jclass safe_annotation_clazz,
-                              jobject retained_object_set);
+                              jclass safe_annotation_clazz);
   void RemoveJavascriptInterface(JNIEnv* env, jobject obj, jstring name);
   int GetNavigationHistory(JNIEnv* env, jobject obj, jobject history);
   void GetDirectedNavigationHistory(JNIEnv* env,
@@ -374,6 +375,10 @@
 
   bool geolocation_needs_pause_;
 
+  // Manages injecting Java objects.
+  scoped_ptr<JavaBridgeDispatcherHostManager>
+      java_bridge_dispatcher_host_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
 };