| OLD | NEW |
| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 10 #include "base/android/jni_array.h" | 10 #include "base/android/jni_array.h" |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 return GESTURE_EVENT_TYPE_LONG_TAP; | 148 return GESTURE_EVENT_TYPE_LONG_TAP; |
| 149 case WebInputEvent::GesturePinchBegin: | 149 case WebInputEvent::GesturePinchBegin: |
| 150 return GESTURE_EVENT_TYPE_PINCH_BEGIN; | 150 return GESTURE_EVENT_TYPE_PINCH_BEGIN; |
| 151 case WebInputEvent::GesturePinchEnd: | 151 case WebInputEvent::GesturePinchEnd: |
| 152 return GESTURE_EVENT_TYPE_PINCH_END; | 152 return GESTURE_EVENT_TYPE_PINCH_END; |
| 153 case WebInputEvent::GesturePinchUpdate: | 153 case WebInputEvent::GesturePinchUpdate: |
| 154 return GESTURE_EVENT_TYPE_PINCH_BY; | 154 return GESTURE_EVENT_TYPE_PINCH_BY; |
| 155 case WebInputEvent::GestureTwoFingerTap: | 155 case WebInputEvent::GestureTwoFingerTap: |
| 156 default: | 156 default: |
| 157 NOTREACHED() << "Invalid source gesture type: " | 157 NOTREACHED() << "Invalid source gesture type: " |
| 158 << WebInputEventTraits::GetName(type); | 158 << WebInputEvent::GetName(type); |
| 159 return -1; | 159 return -1; |
| 160 } | 160 } |
| 161 } | 161 } |
| 162 | 162 |
| 163 } // namespace | 163 } // namespace |
| 164 | 164 |
| 165 // Enables a callback when the underlying WebContents is destroyed, to enable | 165 // Enables a callback when the underlying WebContents is destroyed, to enable |
| 166 // nulling the back-pointer. | 166 // nulling the back-pointer. |
| 167 class ContentViewCoreImpl::ContentViewUserData | 167 class ContentViewCoreImpl::ContentViewUserData |
| 168 : public base::SupportsUserData::Data { | 168 : public base::SupportsUserData::Data { |
| (...skipping 1469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1638 return ScopedJavaLocalRef<jobject>(); | 1638 return ScopedJavaLocalRef<jobject>(); |
| 1639 | 1639 |
| 1640 return view->GetJavaObject(); | 1640 return view->GetJavaObject(); |
| 1641 } | 1641 } |
| 1642 | 1642 |
| 1643 bool RegisterContentViewCore(JNIEnv* env) { | 1643 bool RegisterContentViewCore(JNIEnv* env) { |
| 1644 return RegisterNativesImpl(env); | 1644 return RegisterNativesImpl(env); |
| 1645 } | 1645 } |
| 1646 | 1646 |
| 1647 } // namespace content | 1647 } // namespace content |
| OLD | NEW |