Upstream evaluateJavaScript

content/browser/android/content_view_core_impl.h

Index: content/browser/android/content_view_core_impl.h
diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
index 7c6a69790e3a3a2b92d0732b8ea9edfa09ba3090..8dbacb66c64d743cb2aecf3f89e62609b6d07d6d 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -17,6 +17,7 @@
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "ui/gfx/rect.h"
@@ -111,6 +112,7 @@ class ContentViewCoreImpl : public ContentViewCore,
   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);
   void AddJavascriptInterface(JNIEnv* env,
                               jobject obj,
                               jobject object,
@@ -193,6 +195,8 @@ class ContentViewCoreImpl : public ContentViewCore,
   struct JavaObject;
   JavaObject* java_object_;
 
+  content::NotificationRegistrar notification_registrar_;

[jam, 2012/07/31 18:20:44]

content:: is unnecessary

[David Trainor- moved to gerrit, 2012/07/31 20:38:47]

Done.

+
   // Reference to the current WebContents used to determine how and what to
   // display in the ContentViewCore.
   WebContentsImpl* web_contents_;