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

Side by Side Diff: content/browser/android/content_view_core_impl.cc

Issue 868123002: Reset gesture detection upon page navigation for Aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename the method Created 5 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 1112 matching lines...) Expand 10 before | Expand all | Expand 10 after
1123 jobject obj, 1123 jobject obj,
1124 jboolean hidden) { 1124 jboolean hidden) {
1125 RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid(); 1125 RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
1126 if (rwhv) 1126 if (rwhv)
1127 rwhv->SetTextHandlesTemporarilyHidden(hidden); 1127 rwhv->SetTextHandlesTemporarilyHidden(hidden);
1128 } 1128 }
1129 1129
1130 void ContentViewCoreImpl::ResetGestureDetection(JNIEnv* env, jobject obj) { 1130 void ContentViewCoreImpl::ResetGestureDetection(JNIEnv* env, jobject obj) {
1131 RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid(); 1131 RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
1132 if (rwhv) 1132 if (rwhv)
1133 rwhv->ResetGestureDetection(); 1133 rwhv->OnMainFrameNavigation();
jdduke (slow) 2015/01/30 18:49:48 Oh, let's keep |ResetGestureDetection| in RWHVAndr
lanwei 2015/02/04 21:10:05 Done.
1134 } 1134 }
1135 1135
1136 void ContentViewCoreImpl::SetDoubleTapSupportEnabled(JNIEnv* env, 1136 void ContentViewCoreImpl::SetDoubleTapSupportEnabled(JNIEnv* env,
1137 jobject obj, 1137 jobject obj,
1138 jboolean enabled) { 1138 jboolean enabled) {
1139 RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid(); 1139 RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
1140 if (rwhv) 1140 if (rwhv)
1141 rwhv->SetDoubleTapSupportEnabled(enabled); 1141 rwhv->SetDoubleTapSupportEnabled(enabled);
1142 } 1142 }
1143 1143
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
1355 reinterpret_cast<ui::WindowAndroid*>(window_android), 1355 reinterpret_cast<ui::WindowAndroid*>(window_android),
1356 retained_objects_set); 1356 retained_objects_set);
1357 return reinterpret_cast<intptr_t>(view); 1357 return reinterpret_cast<intptr_t>(view);
1358 } 1358 }
1359 1359
1360 bool RegisterContentViewCore(JNIEnv* env) { 1360 bool RegisterContentViewCore(JNIEnv* env) {
1361 return RegisterNativesImpl(env); 1361 return RegisterNativesImpl(env);
1362 } 1362 }
1363 1363
1364 } // namespace content 1364 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698