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

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

Issue 2054193002: Android mouse events shouldn't appear as TouchEvents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added working mouse buttons. Created 4 years, 2 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 #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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 jfloat orientation_1, 121 jfloat orientation_1,
122 jfloat tilt_0, 122 jfloat tilt_0,
123 jfloat tilt_1, 123 jfloat tilt_1,
124 jfloat raw_pos_x, 124 jfloat raw_pos_x,
125 jfloat raw_pos_y, 125 jfloat raw_pos_y,
126 jint android_tool_type_0, 126 jint android_tool_type_0,
127 jint android_tool_type_1, 127 jint android_tool_type_1,
128 jint android_button_state, 128 jint android_button_state,
129 jint android_meta_state, 129 jint android_meta_state,
130 jboolean is_touch_handle_event); 130 jboolean is_touch_handle_event);
131 jboolean SendMouseMoveEvent(JNIEnv* env, 131 jboolean SendMouseEvent(JNIEnv* env,
132 const base::android::JavaParamRef<jobject>& obj, 132 const base::android::JavaParamRef<jobject>& obj,
133 jlong time_ms, 133 jlong time_ms,
134 jfloat x, 134 jint android_action,
135 jfloat y, 135 jfloat x,
136 jint tool_type); 136 jfloat y,
137 jint pointer_id,
138 jfloat pressure,
139 jfloat orientation,
140 jfloat tilt,
141 jint android_button_state,
142 jint tool_type);
137 jboolean SendMouseWheelEvent(JNIEnv* env, 143 jboolean SendMouseWheelEvent(JNIEnv* env,
138 const base::android::JavaParamRef<jobject>& obj, 144 const base::android::JavaParamRef<jobject>& obj,
139 jlong time_ms, 145 jlong time_ms,
140 jfloat x, 146 jfloat x,
141 jfloat y, 147 jfloat y,
142 jfloat ticks_x, 148 jfloat ticks_x,
143 jfloat ticks_y, 149 jfloat ticks_y,
144 jfloat pixels_per_tick); 150 jfloat pixels_per_tick);
145 void ScrollBegin(JNIEnv* env, 151 void ScrollBegin(JNIEnv* env,
146 const base::android::JavaParamRef<jobject>& obj, 152 const base::android::JavaParamRef<jobject>& obj,
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 471
466 // Observer to notify of lifecyle changes. 472 // Observer to notify of lifecyle changes.
467 base::ObserverList<ContentViewCoreImplObserver> observer_list_; 473 base::ObserverList<ContentViewCoreImplObserver> observer_list_;
468 474
469 // The cache of device's current orientation set from Java side, this value 475 // The cache of device's current orientation set from Java side, this value
470 // will be sent to Renderer once it is ready. 476 // will be sent to Renderer once it is ready.
471 int device_orientation_; 477 int device_orientation_;
472 478
473 bool accessibility_enabled_; 479 bool accessibility_enabled_;
474 480
481 // The buttons currently depressed, see MotionEvent.getButtonState().
482 int button_state_;
483
475 // Manages injecting Java objects. 484 // Manages injecting Java objects.
476 scoped_refptr<GinJavaBridgeDispatcherHost> java_bridge_dispatcher_host_; 485 scoped_refptr<GinJavaBridgeDispatcherHost> java_bridge_dispatcher_host_;
477 486
478 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); 487 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
479 }; 488 };
480 489
481 bool RegisterContentViewCore(JNIEnv* env); 490 bool RegisterContentViewCore(JNIEnv* env);
482 491
483 } // namespace content 492 } // namespace content
484 493
485 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 494 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/android/content_view_core_impl.cc » ('j') | content/browser/android/content_view_core_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698