OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "content/browser/vibration/vibration_provider_android.h" | 5 #include "device/vibration/vibration_provider_android.h" |
6 | 6 |
Tom Sepez
2014/12/01 18:27:17
nit: no blank line?
timvolodine
2014/12/02 19:37:57
I believe this is correct: main header include, bl
| |
7 #include <algorithm> | 7 #include "device/vibration/vibration_manager_impl.h" |
Tom Sepez
2014/12/01 18:27:16
nit: alphabetize.
timvolodine
2014/12/02 19:37:57
see above. done.
| |
8 | |
9 #include "content/browser/vibration/vibration_message_filter.h" | |
10 #include "content/common/view_messages.h" | |
11 #include "jni/VibrationProvider_jni.h" | 8 #include "jni/VibrationProvider_jni.h" |
12 #include "third_party/WebKit/public/platform/WebVibration.h" | |
13 | 9 |
14 using base::android::AttachCurrentThread; | 10 using base::android::AttachCurrentThread; |
15 | 11 |
16 namespace content { | 12 namespace device { |
17 | 13 |
18 VibrationProviderAndroid::VibrationProviderAndroid() { | 14 VibrationProviderAndroid::VibrationProviderAndroid() { |
19 } | 15 } |
20 | 16 |
21 VibrationProviderAndroid::~VibrationProviderAndroid() { | 17 VibrationProviderAndroid::~VibrationProviderAndroid() { |
22 } | 18 } |
23 | 19 |
24 // static | 20 // static |
25 bool VibrationProviderAndroid::Register(JNIEnv* env) { | 21 bool VibrationProviderAndroid::Register(JNIEnv* env) { |
26 return RegisterNativesImpl(env); | 22 return RegisterNativesImpl(env); |
27 } | 23 } |
28 | 24 |
29 void VibrationProviderAndroid::Vibrate(int64 milliseconds) { | 25 void VibrationProviderAndroid::Vibrate(int64 milliseconds) { |
30 if (j_vibration_provider_.is_null()) { | 26 if (j_vibration_provider_.is_null()) { |
31 j_vibration_provider_.Reset( | 27 j_vibration_provider_.Reset( |
32 Java_VibrationProvider_create( | 28 Java_VibrationProvider_create( |
33 AttachCurrentThread(), | 29 AttachCurrentThread(), |
34 base::android::GetApplicationContext())); | 30 base::android::GetApplicationContext())); |
35 } | 31 } |
36 Java_VibrationProvider_vibrate(AttachCurrentThread(), | 32 Java_VibrationProvider_vibrate(AttachCurrentThread(), |
37 j_vibration_provider_.obj(), | 33 j_vibration_provider_.obj(), |
38 milliseconds); | 34 milliseconds); |
39 } | 35 } |
40 | 36 |
41 void VibrationProviderAndroid::CancelVibration() { | 37 void VibrationProviderAndroid::CancelVibration() { |
42 // If somehow a cancel message is received before this object was | 38 // If somehow a cancel message is received before this object was |
43 // instantiated, it means there is no current vibration anyway. Just return. | 39 // instantiated, it means there is no current vibration anyway. Just return. |
44 if (j_vibration_provider_.is_null()) | 40 if (j_vibration_provider_.is_null()) |
45 return; | 41 return; |
46 | |
47 Java_VibrationProvider_cancelVibration(AttachCurrentThread(), | 42 Java_VibrationProvider_cancelVibration(AttachCurrentThread(), |
48 j_vibration_provider_.obj()); | 43 j_vibration_provider_.obj()); |
49 } | 44 } |
50 | 45 |
51 // static | 46 // static |
52 VibrationProvider* VibrationMessageFilter::CreateProvider() { | 47 VibrationProvider* VibrationManagerImpl::CreateProvider() { |
53 return new VibrationProviderAndroid(); | 48 return new VibrationProviderAndroid(); |
54 } | 49 } |
55 | 50 |
56 } // namespace content | 51 } // namespace device |
OLD | NEW |