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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 java_state = 1; | 84 java_state = 1; |
85 break; | 85 break; |
86 case DiscoveryState::IDLE: | 86 case DiscoveryState::IDLE: |
87 java_state = 2; | 87 java_state = 2; |
88 break; | 88 break; |
89 } | 89 } |
90 Java_BluetoothChooserDialog_notifyDiscoveryState( | 90 Java_BluetoothChooserDialog_notifyDiscoveryState( |
91 AttachCurrentThread(), java_dialog_.obj(), java_state); | 91 AttachCurrentThread(), java_dialog_.obj(), java_state); |
92 } | 92 } |
93 | 93 |
94 void BluetoothChooserAndroid::AddDevice(const std::string& device_id, | 94 void BluetoothChooserAndroid::AddOrUpdateDevice( |
95 const base::string16& device_name) { | 95 const std::string& device_id, |
| 96 const base::string16& device_name) { |
96 JNIEnv* env = AttachCurrentThread(); | 97 JNIEnv* env = AttachCurrentThread(); |
97 ScopedJavaLocalRef<jstring> java_device_id = | 98 ScopedJavaLocalRef<jstring> java_device_id = |
98 ConvertUTF8ToJavaString(env, device_id); | 99 ConvertUTF8ToJavaString(env, device_id); |
99 ScopedJavaLocalRef<jstring> java_device_name = | 100 ScopedJavaLocalRef<jstring> java_device_name = |
100 ConvertUTF16ToJavaString(env, device_name); | 101 ConvertUTF16ToJavaString(env, device_name); |
101 Java_BluetoothChooserDialog_addDevice( | 102 Java_BluetoothChooserDialog_addOrUpdateDevice( |
102 env, java_dialog_.obj(), java_device_id.obj(), java_device_name.obj()); | 103 env, java_dialog_.obj(), java_device_id.obj(), java_device_name.obj()); |
103 } | 104 } |
104 | 105 |
105 void BluetoothChooserAndroid::RemoveDevice(const std::string& device_id) { | 106 void BluetoothChooserAndroid::RemoveDevice(const std::string& device_id) { |
106 JNIEnv* env = AttachCurrentThread(); | 107 JNIEnv* env = AttachCurrentThread(); |
107 ScopedJavaLocalRef<jstring> java_device_id = | 108 ScopedJavaLocalRef<jstring> java_device_id = |
108 ConvertUTF16ToJavaString(env, base::UTF8ToUTF16(device_id)); | 109 ConvertUTF16ToJavaString(env, base::UTF8ToUTF16(device_id)); |
109 Java_BluetoothChooserDialog_removeDevice(env, java_dialog_.obj(), | 110 Java_BluetoothChooserDialog_removeDevice(env, java_dialog_.obj(), |
110 java_device_id.obj()); | 111 java_device_id.obj()); |
111 } | 112 } |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
165 // static | 166 // static |
166 bool BluetoothChooserAndroid::Register(JNIEnv* env) { | 167 bool BluetoothChooserAndroid::Register(JNIEnv* env) { |
167 return RegisterNativesImpl(env); | 168 return RegisterNativesImpl(env); |
168 } | 169 } |
169 | 170 |
170 void BluetoothChooserAndroid::OpenURL(const char* url) { | 171 void BluetoothChooserAndroid::OpenURL(const char* url) { |
171 web_contents_->OpenURL(content::OpenURLParams( | 172 web_contents_->OpenURL(content::OpenURLParams( |
172 GURL(url), content::Referrer(), NEW_FOREGROUND_TAB, | 173 GURL(url), content::Referrer(), NEW_FOREGROUND_TAB, |
173 ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false /* is_renderer_initiated */)); | 174 ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false /* is_renderer_initiated */)); |
174 } | 175 } |
OLD | NEW |