| Index: ui/base/touch/touch_device_android.cc
|
| diff --git a/ui/base/touch/touch_device_android.cc b/ui/base/touch/touch_device_android.cc
|
| index fdb4a82f5b653bdf82303660bfd921833ae39b5a..2a65323a76d1e1a8f4e3fb26e035f86ace2ba52c 100644
|
| --- a/ui/base/touch/touch_device_android.cc
|
| +++ b/ui/base/touch/touch_device_android.cc
|
| @@ -4,13 +4,11 @@
|
|
|
| #include "ui/base/touch/touch_device.h"
|
|
|
| -#include "base/android/context_utils.h"
|
| #include "base/android/jni_array.h"
|
| #include "base/logging.h"
|
| #include "jni/TouchDevice_jni.h"
|
|
|
| using base::android::AttachCurrentThread;
|
| -using base::android::GetApplicationContext;
|
|
|
| namespace ui {
|
|
|
| @@ -19,17 +17,14 @@ TouchScreensAvailability GetTouchScreensAvailability() {
|
| }
|
|
|
| int MaxTouchPoints() {
|
| - return Java_TouchDevice_maxTouchPoints(AttachCurrentThread(),
|
| - GetApplicationContext());
|
| + return Java_TouchDevice_maxTouchPoints(AttachCurrentThread());
|
| }
|
|
|
| std::pair<int, int> GetAvailablePointerAndHoverTypes() {
|
| JNIEnv* env = AttachCurrentThread();
|
| std::vector<int> pointer_and_hover_types;
|
| base::android::JavaIntArrayToIntVector(
|
| - env, Java_TouchDevice_availablePointerAndHoverTypes(
|
| - env, GetApplicationContext())
|
| - .obj(),
|
| + env, Java_TouchDevice_availablePointerAndHoverTypes(env).obj(),
|
| &pointer_and_hover_types);
|
| DCHECK_EQ(pointer_and_hover_types.size(), 2u);
|
| return std::make_pair(pointer_and_hover_types[0], pointer_and_hover_types[1]);
|
|
|