Upstream evaluateJavaScript

content/browser/android/content_view_core_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 
 #include <vector>
 
 #include "base/android/jni_helper.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 #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"
 
 struct WebMenuItem;
 
 namespace content {
 class ContentViewClient;
 class RenderWidgetHostViewAndroid;
 
@@ skipping 74 matching lines @@
   jboolean CanGoToOffset(JNIEnv* env, jobject obj, jint offset);
   void GoBack(JNIEnv* env, jobject obj);
   void GoForward(JNIEnv* env, jobject obj);
   void GoToOffset(JNIEnv* env, jobject obj, jint offset);
   jdouble GetLoadProgress(JNIEnv* env, jobject obj) const;
   void StopLoading(JNIEnv* env, jobject obj);
   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);
   void AddJavascriptInterface(JNIEnv* env,
                               jobject obj,
                               jobject object,
                               jstring name,
                               jboolean allow_inherited_methods);
   void RemoveJavascriptInterface(JNIEnv* env, jobject obj, jstring name);
 
   // --------------------------------------------------------------------------
   // Public methods that call to Java via JNI
   // --------------------------------------------------------------------------
@@ skipping 62 matching lines @@
 
   void SendGestureEvent(WebKit::WebInputEvent::Type type, long time_ms,
                         int x, int y,
                         float dx, float dy, bool link_preview_tap);
 
   void PostLoadUrl(const GURL& url);
 
   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_;
 
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
 };
 
 bool RegisterContentViewCore(JNIEnv* env);
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_