| 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 #include "content/browser/android/content_view_core_impl.h" | 5 #include "content/browser/android/content_view_core_impl.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_array.h" | 8 #include "base/android/jni_array.h" |
| 9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
| 10 #include "base/android/scoped_java_ref.h" | 10 #include "base/android/scoped_java_ref.h" |
| (...skipping 813 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 824 web_contents_->GetController().GoToOffset(offset); | 824 web_contents_->GetController().GoToOffset(offset); |
| 825 } | 825 } |
| 826 | 826 |
| 827 void ContentViewCoreImpl::StopLoading(JNIEnv* env, jobject obj) { | 827 void ContentViewCoreImpl::StopLoading(JNIEnv* env, jobject obj) { |
| 828 web_contents_->Stop(); | 828 web_contents_->Stop(); |
| 829 } | 829 } |
| 830 | 830 |
| 831 void ContentViewCoreImpl::Reload(JNIEnv* env, jobject obj) { | 831 void ContentViewCoreImpl::Reload(JNIEnv* env, jobject obj) { |
| 832 // Set check_for_repost parameter to false as we have no repost confirmation | 832 // Set check_for_repost parameter to false as we have no repost confirmation |
| 833 // dialog ("confirm form resubmission" screen will still appear, however). | 833 // dialog ("confirm form resubmission" screen will still appear, however). |
| 834 web_contents_->GetController().Reload(false); | 834 web_contents_->GetController().Reload(true); |
| 835 tab_crashed_ = false; | 835 tab_crashed_ = false; |
| 836 } | 836 } |
| 837 | 837 |
| 838 void ContentViewCoreImpl::CancelPendingReload(JNIEnv* env, jobject obj) { |
| 839 web_contents_->GetController().CancelPendingReload(); |
| 840 } |
| 841 |
| 842 void ContentViewCoreImpl::ContinuePendingReload(JNIEnv* env, jobject obj) { |
| 843 web_contents_->GetController().ContinuePendingReload(); |
| 844 } |
| 845 |
| 838 void ContentViewCoreImpl::ClearHistory(JNIEnv* env, jobject obj) { | 846 void ContentViewCoreImpl::ClearHistory(JNIEnv* env, jobject obj) { |
| 839 web_contents_->GetController().PruneAllButActive(); | 847 web_contents_->GetController().PruneAllButActive(); |
| 840 } | 848 } |
| 841 | 849 |
| 842 void ContentViewCoreImpl::AddJavascriptInterface( | 850 void ContentViewCoreImpl::AddJavascriptInterface( |
| 843 JNIEnv* env, | 851 JNIEnv* env, |
| 844 jobject /* obj */, | 852 jobject /* obj */, |
| 845 jobject object, | 853 jobject object, |
| 846 jstring name, | 854 jstring name, |
| 847 jboolean require_annotation) { | 855 jboolean require_annotation) { |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1036 if (!HasField(env, clazz, "mNativeContentViewCore", "I")) { | 1044 if (!HasField(env, clazz, "mNativeContentViewCore", "I")) { |
| 1037 DLOG(ERROR) << "Unable to find ContentView.mNativeContentViewCore!"; | 1045 DLOG(ERROR) << "Unable to find ContentView.mNativeContentViewCore!"; |
| 1038 return false; | 1046 return false; |
| 1039 } | 1047 } |
| 1040 g_native_content_view = GetFieldID(env, clazz, "mNativeContentViewCore", "I"); | 1048 g_native_content_view = GetFieldID(env, clazz, "mNativeContentViewCore", "I"); |
| 1041 | 1049 |
| 1042 return RegisterNativesImpl(env) >= 0; | 1050 return RegisterNativesImpl(env) >= 0; |
| 1043 } | 1051 } |
| 1044 | 1052 |
| 1045 } // namespace content | 1053 } // namespace content |
| OLD | NEW |