Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Unified Diff: content/browser/android/content_view_core_impl.cc

Issue 10830173: JavaBridge should use Annotation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index f50b048c97c9dc96cae95ecff48cda792ad41937..4cdbb47572bb908296757370ca3f0132e6855fb5 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -378,12 +378,12 @@ void ContentViewCoreImpl::AddJavascriptInterface(
jobject /* obj */,
jobject object,
jstring name,
- jboolean allow_inherited_methods) {
+ jboolean require_safe_annotation) {
ScopedJavaLocalRef<jobject> scoped_object(env, object);
// JavaBoundObject creates the NPObject with a ref count of 1, and
// JavaBridgeDispatcherHostManager takes its own ref.
NPObject* bound_object = JavaBoundObject::Create(scoped_object,
- allow_inherited_methods);
+ require_safe_annotation);
web_contents_->java_bridge_dispatcher_host_manager()->AddNamedObject(
ConvertJavaStringToUTF16(env, name), bound_object);
WebKit::WebBindings::releaseObject(bound_object);

Powered by Google App Engine
This is Rietveld 408576698