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 eea6814dc14217c7fb6a8918771b7e6455a1a957..fa5ed02242c5ae4e3bc65ae204301a47601e8d94 100644 |
--- a/content/browser/android/content_view_core_impl.h |
+++ b/content/browser/android/content_view_core_impl.h |
@@ -50,7 +50,6 @@ class ContentViewCoreImpl : public ContentViewCore, |
virtual ui::ViewAndroid* GetViewAndroid() const OVERRIDE; |
virtual ui::WindowAndroid* GetWindowAndroid() const OVERRIDE; |
virtual scoped_refptr<cc::Layer> GetLayer() const OVERRIDE; |
- virtual void LoadUrl(NavigationController::LoadURLParams& params) OVERRIDE; |
virtual void ShowPastePopup(int x, int y) OVERRIDE; |
virtual void GetScaledContentBitmap( |
float scale, |
@@ -79,21 +78,6 @@ class ContentViewCoreImpl : public ContentViewCore, |
// Notifies the ContentViewCore that items were selected in the currently |
// showing select popup. |
void SelectPopupMenuItems(JNIEnv* env, jobject obj, jintArray indices); |
- |
- void LoadUrl( |
- JNIEnv* env, jobject obj, |
- jstring url, |
- jint load_url_type, |
- jint transition_type, |
- jstring j_referrer_url, |
- jint referrer_policy, |
- jint ua_override_option, |
- jstring extra_headers, |
- jbyteArray post_data, |
- jstring base_url_for_data_url, |
- jstring virtual_url_for_data_url, |
- jboolean can_load_local_resources, |
- jboolean is_renderer_initiated); |
base::android::ScopedJavaLocalRef<jstring> GetURL(JNIEnv* env, jobject) const; |
jboolean IsIncognito(JNIEnv* env, jobject obj); |
void SendOrientationChangeEvent(JNIEnv* env, jobject obj, jint orientation); |
@@ -160,7 +144,6 @@ class ContentViewCoreImpl : public ContentViewCore, |
jobject obj, |
jboolean enabled); |
- void ClearHistory(JNIEnv* env, jobject obj); |
void EvaluateJavaScript(JNIEnv* env, |
jobject obj, |
jstring script, |
@@ -173,12 +156,6 @@ class ContentViewCoreImpl : public ContentViewCore, |
jint GetBackgroundColor(JNIEnv* env, jobject obj); |
void SetBackgroundColor(JNIEnv* env, jobject obj, jint color); |
- void ClearSslPreferences(JNIEnv* env, jobject /* obj */); |
- void SetUseDesktopUserAgent(JNIEnv* env, |
- jobject /* obj */, |
- jboolean state, |
- jboolean reload_on_state_change); |
- bool GetUseDesktopUserAgent(JNIEnv* env, jobject /* obj */); |
void SetAllowJavascriptInterfacesInspection(JNIEnv* env, |
jobject obj, |
jboolean allow); |
@@ -188,14 +165,6 @@ class ContentViewCoreImpl : public ContentViewCore, |
jstring name, |
jclass safe_annotation_clazz); |
void RemoveJavascriptInterface(JNIEnv* env, jobject obj, jstring name); |
- int GetNavigationHistory(JNIEnv* env, jobject obj, jobject history); |
- void GetDirectedNavigationHistory(JNIEnv* env, |
- jobject obj, |
- jobject history, |
- jboolean is_forward, |
- jint max_entries); |
- base::android::ScopedJavaLocalRef<jstring> |
- GetOriginalUrlForActiveNavigationEntry(JNIEnv* env, jobject obj); |
void WasResized(JNIEnv* env, jobject obj); |
void SetAccessibilityEnabled(JNIEnv* env, jobject obj, bool enabled); |