OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "chrome/browser/ui/android/bluetooth_chooser_android.h" | 5 #include "chrome/browser/ui/android/bluetooth_chooser_android.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "chrome/browser/ssl/chrome_security_state_model_client.h" | 10 #include "chrome/browser/ssl/chrome_security_state_model_client.h" |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 java_state = 1; | 85 java_state = 1; |
86 break; | 86 break; |
87 case DiscoveryState::IDLE: | 87 case DiscoveryState::IDLE: |
88 java_state = 2; | 88 java_state = 2; |
89 break; | 89 break; |
90 } | 90 } |
91 Java_BluetoothChooserDialog_notifyDiscoveryState( | 91 Java_BluetoothChooserDialog_notifyDiscoveryState( |
92 AttachCurrentThread(), java_dialog_.obj(), java_state); | 92 AttachCurrentThread(), java_dialog_.obj(), java_state); |
93 } | 93 } |
94 | 94 |
95 void BluetoothChooserAndroid::AddDevice(const std::string& device_id, | 95 void BluetoothChooserAndroid::AddOrUpdateDevice( |
96 const base::string16& device_name) { | 96 const std::string& device_id, |
| 97 bool should_update_name, |
| 98 const base::string16& device_name, |
| 99 bool is_gatt_connected, |
| 100 bool is_paired, |
| 101 const int8_t* rssi) { |
97 JNIEnv* env = AttachCurrentThread(); | 102 JNIEnv* env = AttachCurrentThread(); |
98 ScopedJavaLocalRef<jstring> java_device_id = | 103 ScopedJavaLocalRef<jstring> java_device_id = |
99 ConvertUTF8ToJavaString(env, device_id); | 104 ConvertUTF8ToJavaString(env, device_id); |
100 ScopedJavaLocalRef<jstring> java_device_name = | 105 ScopedJavaLocalRef<jstring> java_device_name = |
101 ConvertUTF16ToJavaString(env, device_name); | 106 ConvertUTF16ToJavaString(env, device_name); |
102 Java_BluetoothChooserDialog_addDevice( | 107 Java_BluetoothChooserDialog_addOrUpdateDevice( |
103 env, java_dialog_.obj(), java_device_id.obj(), java_device_name.obj()); | 108 env, java_dialog_.obj(), java_device_id.obj(), java_device_name.obj()); |
104 } | 109 } |
105 | 110 |
106 void BluetoothChooserAndroid::RemoveDevice(const std::string& device_id) { | 111 void BluetoothChooserAndroid::RemoveDevice(const std::string& device_id) { |
107 JNIEnv* env = AttachCurrentThread(); | 112 JNIEnv* env = AttachCurrentThread(); |
108 ScopedJavaLocalRef<jstring> java_device_id = | 113 ScopedJavaLocalRef<jstring> java_device_id = |
109 ConvertUTF16ToJavaString(env, base::UTF8ToUTF16(device_id)); | 114 ConvertUTF16ToJavaString(env, base::UTF8ToUTF16(device_id)); |
110 Java_BluetoothChooserDialog_removeDevice(env, java_dialog_.obj(), | 115 Java_BluetoothChooserDialog_removeDevice(env, java_dialog_.obj(), |
111 java_device_id.obj()); | 116 java_device_id.obj()); |
112 } | 117 } |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 // static | 171 // static |
167 bool BluetoothChooserAndroid::Register(JNIEnv* env) { | 172 bool BluetoothChooserAndroid::Register(JNIEnv* env) { |
168 return RegisterNativesImpl(env); | 173 return RegisterNativesImpl(env); |
169 } | 174 } |
170 | 175 |
171 void BluetoothChooserAndroid::OpenURL(const char* url) { | 176 void BluetoothChooserAndroid::OpenURL(const char* url) { |
172 web_contents_->OpenURL(content::OpenURLParams( | 177 web_contents_->OpenURL(content::OpenURLParams( |
173 GURL(url), content::Referrer(), NEW_FOREGROUND_TAB, | 178 GURL(url), content::Referrer(), NEW_FOREGROUND_TAB, |
174 ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false /* is_renderer_initiated */)); | 179 ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false /* is_renderer_initiated */)); |
175 } | 180 } |
OLD | NEW |