Plumbing maxTouchPoints for Android.

ui/base/touch/touch_device.h

Index: ui/base/touch/touch_device.h
diff --git a/ui/base/touch/touch_device.h b/ui/base/touch/touch_device.h
index 099f6ef842f9aab4f8e2f6b1c99312718450b346..e61b1e6f4410760ed0ea2f1e1c745a15266beb69 100644
--- a/ui/base/touch/touch_device.h
+++ b/ui/base/touch/touch_device.h
@@ -7,12 +7,12 @@
 
 #include "ui/base/ui_base_export.h"
 
-namespace ui {
+#ifdef OS_ANDROID
+#include <jni.h>
+#endif
+
 
-// TODO(sblom): This is non-standard, and should be removed before
-// RuntimeEnabledFlags::PointerEventsMaxTouchPoints is marked stable.
-// Tracked by: http://crbug.com/308649
-const int kMaxTouchPointsUnknown = -1;
+namespace ui {
 
 // Returns true if a touch device is available.
 UI_BASE_EXPORT bool IsTouchDevicePresent();
@@ -26,6 +26,10 @@ UI_BASE_EXPORT bool IsTouchDevicePresent();
 // http://www.w3.org/TR/pointerevents/#widl-Navigator-maxTouchPoints
 UI_BASE_EXPORT int MaxTouchPoints();
 
+#ifdef OS_ANDROID
+bool RegisterTouchDeviceAndroid(JNIEnv* env);
+#endif
+
 }  // namespace ui
 
 #endif  // UI_BASE_TOUCH_TOUCH_DEVICE_H_