JavaBridge should use Annotation

content/browser/renderer_host/java/java_bound_object.h

Index: content/browser/renderer_host/java/java_bound_object.h
diff --git a/content/browser/renderer_host/java/java_bound_object.h b/content/browser/renderer_host/java/java_bound_object.h
index d66ac83c5bfbcd89138e2256b67af6688c2a1c41..6a6616fd6337602f4006ba6e9f8c1cde6907f693 100644
--- a/content/browser/renderer_host/java/java_bound_object.h
+++ b/content/browser/renderer_host/java/java_bound_object.h
@@ -24,12 +24,12 @@
 class JavaBoundObject {
  public:
   // Takes a Java object and creates a JavaBoundObject around it. Also takes
-  // a boolean that determines whether or not inherited methods are allowed
-  // to be called as well.  This property propagates to all Objects that get
-  // implicitly exposed as return values as well. Returns an NPObject with
+  // a boolean that determines whether or not methods require the safe
+  // annotation to be exposed.  This property propagates to all Objects that

[joth, 2012/08/04 20:38:28]

takes a boolean that determines whether or not methods require an explicit
annotation marking them as safe to be exposed to JavaScript. 

[Steve Block, 2012/08/06 12:12:30]

Or 'The require_safe_annotation flag specifies whether only methods with the
JavaScriptInterface annotation are exposed to JavaScript.'

[palmer, 2012/08/06 17:31:26]

+1 to this version of the explanation.

[David Trainor- moved to gerrit, 2012/08/06 23:42:33]

Done.

+  // get implicitly exposed as return values as well. Returns an NPObject with
   // a ref count of one which owns the JavaBoundObject.
   static NPObject* Create(const base::android::JavaRef<jobject>& object,
-                          bool allow_inherited_methods);
+                          bool require_safe_annotation);
 
   virtual ~JavaBoundObject();
 
@@ -45,7 +45,7 @@ class JavaBoundObject {
 
  private:
   explicit JavaBoundObject(const base::android::JavaRef<jobject>& object,
-                           bool allow_inherited_methods);
+                           bool require_safe_annotation);
 
   void EnsureMethodsAreSetUp() const;
 
@@ -60,9 +60,11 @@ class JavaBoundObject {
   mutable JavaMethodMap methods_;
   mutable bool are_methods_set_up_;
 
-  bool allow_inherited_methods_;
+  bool require_safe_annotation_;

[joth, 2012/08/04 20:38:28]

const bool

[David Trainor- moved to gerrit, 2012/08/06 23:42:33]

Done.

 
   DISALLOW_IMPLICIT_CONSTRUCTORS(JavaBoundObject);
 };
 
+bool RegisterJavaBoundObject(JNIEnv* env);
+
 #endif  // CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BOUND_OBJECT_H_