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

Side by Side Diff: ui/base/touch/touch_device_android.cc

Issue 2202033002: ui: Remove unneeded RegisterNatives() call on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@jnireg1
Patch Set: rebase, unused headers Created 4 years, 4 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
« no previous file with comments | « ui/base/touch/touch_device.h ('k') | ui/base/ui_base.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "ui/base/touch/touch_device.h" 5 #include "ui/base/touch/touch_device.h"
6 6
7 #include "base/android/context_utils.h" 7 #include "base/android/context_utils.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "jni/TouchDevice_jni.h" 9 #include "jni/TouchDevice_jni.h"
10 10
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 HoverType GetPrimaryHoverType() { 50 HoverType GetPrimaryHoverType() {
51 int available_hover_types = GetAvailableHoverTypes(); 51 int available_hover_types = GetAvailableHoverTypes();
52 if (available_hover_types & HOVER_TYPE_ON_DEMAND) 52 if (available_hover_types & HOVER_TYPE_ON_DEMAND)
53 return HOVER_TYPE_ON_DEMAND; 53 return HOVER_TYPE_ON_DEMAND;
54 if (available_hover_types & HOVER_TYPE_HOVER) 54 if (available_hover_types & HOVER_TYPE_HOVER)
55 return HOVER_TYPE_HOVER; 55 return HOVER_TYPE_HOVER;
56 DCHECK_EQ(available_hover_types, HOVER_TYPE_NONE); 56 DCHECK_EQ(available_hover_types, HOVER_TYPE_NONE);
57 return HOVER_TYPE_NONE; 57 return HOVER_TYPE_NONE;
58 } 58 }
59 59
60 bool RegisterTouchDeviceAndroid(JNIEnv* env) {
61 return RegisterNativesImpl(env);
62 }
63
64 } // namespace ui 60 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/touch/touch_device.h ('k') | ui/base/ui_base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698