OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ | 5 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ |
6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ | 6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/android/jni_helper.h" | 10 #include "base/android/jni_helper.h" |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
110 void StopLoading(JNIEnv* env, jobject obj); | 110 void StopLoading(JNIEnv* env, jobject obj); |
111 void Reload(JNIEnv* env, jobject obj); | 111 void Reload(JNIEnv* env, jobject obj); |
112 jboolean NeedsReload(JNIEnv* env, jobject obj); | 112 jboolean NeedsReload(JNIEnv* env, jobject obj); |
113 void ClearHistory(JNIEnv* env, jobject obj); | 113 void ClearHistory(JNIEnv* env, jobject obj); |
114 void SetClient(JNIEnv* env, jobject obj, jobject jclient); | 114 void SetClient(JNIEnv* env, jobject obj, jobject jclient); |
115 jint EvaluateJavaScript(JNIEnv* env, jobject obj, jstring script); | 115 jint EvaluateJavaScript(JNIEnv* env, jobject obj, jstring script); |
116 void AddJavascriptInterface(JNIEnv* env, | 116 void AddJavascriptInterface(JNIEnv* env, |
117 jobject obj, | 117 jobject obj, |
118 jobject object, | 118 jobject object, |
119 jstring name, | 119 jstring name, |
120 jboolean allow_inherited_methods); | 120 jboolean require_safe_annotation); |
Steve Block
2012/08/06 12:12:30
Bit of a nit, but referring to this as the 'safe a
palmer
2012/08/06 17:31:26
+1; I'd call it |require_annotations|.
David Trainor- moved to gerrit
2012/08/06 23:42:33
Done.
| |
121 void RemoveJavascriptInterface(JNIEnv* env, jobject obj, jstring name); | 121 void RemoveJavascriptInterface(JNIEnv* env, jobject obj, jstring name); |
122 | 122 |
123 // -------------------------------------------------------------------------- | 123 // -------------------------------------------------------------------------- |
124 // Public methods that call to Java via JNI | 124 // Public methods that call to Java via JNI |
125 // -------------------------------------------------------------------------- | 125 // -------------------------------------------------------------------------- |
126 | 126 |
127 // Creates a popup menu with |items|. | 127 // Creates a popup menu with |items|. |
128 // |multiple| defines if it should support multi-select. | 128 // |multiple| defines if it should support multi-select. |
129 // If not |multiple|, |selected_item| sets the initially selected item. | 129 // If not |multiple|, |selected_item| sets the initially selected item. |
130 // Otherwise, item's "checked" flag selects it. | 130 // Otherwise, item's "checked" flag selects it. |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
211 bool tab_crashed_; | 211 bool tab_crashed_; |
212 | 212 |
213 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); | 213 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); |
214 }; | 214 }; |
215 | 215 |
216 bool RegisterContentViewCore(JNIEnv* env); | 216 bool RegisterContentViewCore(JNIEnv* env); |
217 | 217 |
218 } // namespace content | 218 } // namespace content |
219 | 219 |
220 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ | 220 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ |
OLD | NEW |