| Index: chrome/browser/ui/android/bluetooth_chooser_android.cc
|
| diff --git a/chrome/browser/ui/android/bluetooth_chooser_android.cc b/chrome/browser/ui/android/bluetooth_chooser_android.cc
|
| index d08203fb63008ebe0459f514d568bed7cee544ae..5631e6428dd5f61655a75cd3d2bc0b0625f92e41 100644
|
| --- a/chrome/browser/ui/android/bluetooth_chooser_android.cc
|
| +++ b/chrome/browser/ui/android/bluetooth_chooser_android.cc
|
| @@ -62,12 +62,12 @@ bool BluetoothChooserAndroid::CanAskForScanningPermission() {
|
| }
|
|
|
| void BluetoothChooserAndroid::SetAdapterPresence(AdapterPresence presence) {
|
| + JNIEnv* env = AttachCurrentThread();
|
| if (presence != AdapterPresence::POWERED_ON) {
|
| - Java_BluetoothChooserDialog_notifyAdapterTurnedOff(AttachCurrentThread(),
|
| - java_dialog_.obj());
|
| + Java_BluetoothChooserDialog_notifyAdapterTurnedOff(env, java_dialog_.obj());
|
| } else {
|
| - Java_BluetoothChooserDialog_notifyAdapterTurnedOn(AttachCurrentThread(),
|
| - java_dialog_.obj());
|
| + Java_BluetoothChooserDialog_notifyAdapterTurnedOn(env, java_dialog_.obj());
|
| + RestartSearch();
|
| }
|
| }
|
|
|
| @@ -130,11 +130,15 @@ void BluetoothChooserAndroid::OnDialogFinished(
|
| NOTREACHED();
|
| }
|
|
|
| -void BluetoothChooserAndroid::RestartSearch(JNIEnv* env,
|
| - const JavaParamRef<jobject>& obj) {
|
| +void BluetoothChooserAndroid::RestartSearch() {
|
| event_handler_.Run(Event::RESCAN, "");
|
| }
|
|
|
| +void BluetoothChooserAndroid::RestartSearch(JNIEnv*,
|
| + const JavaParamRef<jobject>&) {
|
| + RestartSearch();
|
| +}
|
| +
|
| void BluetoothChooserAndroid::ShowBluetoothOverviewLink(
|
| JNIEnv* env,
|
| const JavaParamRef<jobject>& obj) {
|
|
|