Revert 158067 - Remove native side of content_view_client

content/browser/android/content_view_core_impl.h

Index: content/browser/android/content_view_core_impl.h
===================================================================
--- content/browser/android/content_view_core_impl.h	(revision 158070)
+++ content/browser/android/content_view_core_impl.h	(working copy)
@@ -29,6 +29,7 @@
 }
 
 namespace content {
+class ContentViewClient;
 class RenderWidgetHostViewAndroid;
 
 // TODO(jrg): this is a shell.  Upstream the rest.
@@ -123,6 +124,7 @@
   void Reload(JNIEnv* env, jobject obj);
   jboolean NeedsReload(JNIEnv* env, jobject obj);
   void ClearHistory(JNIEnv* env, jobject obj);
+  void SetClient(JNIEnv* env, jobject obj, jobject jclient);
   jint EvaluateJavaScript(JNIEnv* env, jobject obj, jstring script);
   int GetNativeImeAdapter(JNIEnv* env, jobject obj);
   void AddJavascriptInterface(JNIEnv* env,
@@ -212,6 +214,9 @@
   // display in the ContentViewCore.
   WebContentsImpl* web_contents_;
 
+  // We only set this to be the delegate of the web_contents if we own it.
+  scoped_ptr<ContentViewClient> content_view_client_;
+
   // Whether the renderer backing this ContentViewCore has crashed.
   bool tab_crashed_;
 
Property changes on: content/browser/android/content_view_core_impl.h
___________________________________________________________________
Deleted: svn:mergeinfo